From faee1d7a9e5b3da933d35d6db1505ded79b3cce6 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 22 Sep 2026 10:30:15 -0700 Subject: [PATCH 01/18] Apply dart fix "migrate_design_widgets" for decoupling migration. This applies the migration using dart fix: ``` dart fix --apply --code=migrate_design_widgets ``` --- .../test_infra/automators/_cpu_profiler_automator.dart | 2 +- .../test_infra/automators/_performance_automator.dart | 2 +- .../benchmark/test_infra/automators/devtools_automator.dart | 2 +- .../devtools_app/benchmark/test_infra/devtools_recorder.dart | 2 +- .../test/live_connection/debugger_panel_test.dart | 2 +- .../test/live_connection/devtools_extensions_test.dart | 2 +- .../test/live_connection/memory_screen_helpers.dart | 2 +- .../performance_screen_event_recording_test.dart | 2 +- .../integration_test/test/offline/perfetto_test.dart | 2 +- packages/devtools_app/lib/initialization.dart | 2 +- packages/devtools_app/lib/src/app.dart | 2 +- .../lib/src/extensions/embedded/_view_desktop.dart | 2 +- .../devtools_app/lib/src/extensions/embedded/_view_web.dart | 2 +- packages/devtools_app/lib/src/extensions/embedded/view.dart | 2 +- .../devtools_app/lib/src/extensions/extension_screen.dart | 2 +- .../lib/src/extensions/extension_screen_controls.dart | 2 +- .../devtools_app/lib/src/extensions/extension_settings.dart | 2 +- packages/devtools_app/lib/src/framework/home_screen.dart | 2 +- packages/devtools_app/lib/src/framework/initializer.dart | 2 +- .../devtools_app/lib/src/framework/notifications_view.dart | 2 +- .../lib/src/framework/observer/disconnect_observer.dart | 2 +- .../lib/src/framework/observer/memory_observer.dart | 2 +- packages/devtools_app/lib/src/framework/release_notes.dart | 2 +- .../devtools_app/lib/src/framework/scaffold/about_dialog.dart | 2 +- packages/devtools_app/lib/src/framework/scaffold/app_bar.dart | 2 +- .../devtools_app/lib/src/framework/scaffold/bottom_pane.dart | 2 +- .../lib/src/framework/scaffold/report_feedback_button.dart | 2 +- .../devtools_app/lib/src/framework/scaffold/scaffold.dart | 2 +- .../lib/src/framework/scaffold/settings_dialog.dart | 2 +- .../devtools_app/lib/src/framework/scaffold/status_line.dart | 2 +- .../lib/src/screens/accessibility/accessibility_screen.dart | 2 +- .../lib/src/screens/accessibility/overrides_pane.dart | 2 +- .../lib/src/screens/accessibility/semantics_tree_pane.dart | 2 +- .../lib/src/screens/app_size/app_size_screen.dart | 2 +- .../devtools_app/lib/src/screens/app_size/app_size_table.dart | 2 +- .../lib/src/screens/app_size/code_size_attribution.dart | 2 +- .../devtools_app/lib/src/screens/debugger/breakpoints.dart | 2 +- .../devtools_app/lib/src/screens/debugger/call_stack.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/codeview.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/common.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/controls.dart | 2 +- .../lib/src/screens/debugger/debugger_screen.dart | 2 +- .../devtools_app/lib/src/screens/debugger/file_search.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/key_sets.dart | 2 +- .../lib/src/screens/debugger/program_explorer.dart | 2 +- .../lib/src/screens/debugger/syntax_highlighter.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/variables.dart | 2 +- .../src/screens/deep_link_validation/deep_link_list_view.dart | 2 +- .../screens/deep_link_validation/deep_links_controller.dart | 2 +- .../src/screens/deep_link_validation/deep_links_model.dart | 2 +- .../src/screens/deep_link_validation/deep_links_screen.dart | 2 +- .../project_root_selection/root_selector.dart | 2 +- .../project_root_selection/select_project_view.dart | 2 +- .../screens/deep_link_validation/validation_details_view.dart | 2 +- .../devtools_app/lib/src/screens/dtd/dtd_tools_screen.dart | 2 +- packages/devtools_app/lib/src/screens/dtd/events.dart | 2 +- packages/devtools_app/lib/src/screens/dtd/services.dart | 2 +- .../lib/src/screens/inspector/inspector_controller.dart | 2 +- .../lib/src/screens/inspector/inspector_controls.dart | 2 +- .../lib/src/screens/inspector/inspector_screen.dart | 2 +- .../lib/src/screens/inspector/inspector_screen_body.dart | 2 +- .../lib/src/screens/inspector/inspector_settings_dialog.dart | 2 +- .../lib/src/screens/inspector/inspector_tree_controller.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/box/box.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/flex/flex.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/flex/utils.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/ui/arrow.dart | 2 +- .../src/screens/inspector/layout_explorer/ui/dimension.dart | 2 +- .../src/screens/inspector/layout_explorer/ui/free_space.dart | 2 +- .../inspector/layout_explorer/ui/layout_explorer_widget.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/ui/theme.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/ui/utils.dart | 2 +- .../inspector/layout_explorer/ui/widget_constraints.dart | 2 +- .../screens/inspector/layout_explorer/ui/widgets_theme.dart | 2 +- .../screens/inspector/widget_properties/properties_view.dart | 2 +- .../devtools_app/lib/src/screens/logging/_log_details.dart | 2 +- .../devtools_app/lib/src/screens/logging/_logs_table.dart | 2 +- .../devtools_app/lib/src/screens/logging/_message_column.dart | 2 +- .../lib/src/screens/logging/logging_controls.dart | 2 +- .../devtools_app/lib/src/screens/logging/logging_screen.dart | 2 +- packages/devtools_app/lib/src/screens/logging/metadata.dart | 2 +- .../lib/src/screens/memory/framework/memory_screen.dart | 2 +- .../lib/src/screens/memory/framework/memory_tabs.dart | 2 +- .../lib/src/screens/memory/framework/screen_body.dart | 2 +- .../chart/controller/charts/android_chart_controller.dart | 2 +- .../panes/chart/controller/charts/event_chart_controller.dart | 2 +- .../panes/chart/controller/charts/vm_chart_controller.dart | 2 +- .../lib/src/screens/memory/panes/chart/data/charts.dart | 2 +- .../memory/panes/chart/widgets/chart_control_pane.dart | 2 +- .../src/screens/memory/panes/chart/widgets/chart_pane.dart | 2 +- .../screens/memory/panes/chart/widgets/interval_dropdown.dart | 2 +- .../lib/src/screens/memory/panes/chart/widgets/legend.dart | 2 +- .../src/screens/memory/panes/chart/widgets/memory_chart.dart | 2 +- .../screens/memory/panes/control/widgets/control_pane.dart | 2 +- .../memory/panes/control/widgets/primary_controls.dart | 2 +- .../memory/panes/control/widgets/secondary_controls.dart | 2 +- .../screens/memory/panes/control/widgets/settings_dialog.dart | 2 +- .../lib/src/screens/memory/panes/diff/diff_pane.dart | 2 +- .../screens/memory/panes/diff/widgets/class_details/path.dart | 2 +- .../screens/memory/panes/diff/widgets/classes_table_diff.dart | 2 +- .../memory/panes/diff/widgets/classes_table_single.dart | 2 +- .../lib/src/screens/memory/panes/diff/widgets/instances.dart | 2 +- .../memory/panes/diff/widgets/snapshot_control_pane.dart | 2 +- .../src/screens/memory/panes/diff/widgets/snapshot_list.dart | 2 +- .../src/screens/memory/panes/diff/widgets/snapshot_view.dart | 2 +- .../lib/src/screens/memory/panes/profile/instances.dart | 2 +- .../lib/src/screens/memory/panes/profile/profile_view.dart | 2 +- .../lib/src/screens/memory/panes/tracing/class_table.dart | 2 +- .../lib/src/screens/memory/panes/tracing/tracing_tree.dart | 2 +- .../lib/src/screens/memory/panes/tracing/tracing_view.dart | 2 +- .../memory/shared/primitives/instance_context_menu.dart | 2 +- .../lib/src/screens/memory/shared/primitives/painting.dart | 2 +- .../lib/src/screens/memory/shared/widgets/class_filter.dart | 2 +- .../devtools_app/lib/src/screens/network/network_model.dart | 2 +- .../lib/src/screens/network/network_request_inspector.dart | 2 +- .../src/screens/network/network_request_inspector_views.dart | 2 +- .../devtools_app/lib/src/screens/network/network_screen.dart | 2 +- .../panes/controls/enhance_tracing/enhance_tracing.dart | 2 +- .../performance/panes/controls/more_debugging_options.dart | 2 +- .../performance/panes/controls/performance_controls.dart | 2 +- .../performance/panes/controls/performance_settings.dart | 2 +- .../panes/flutter_frames/flutter_frames_chart.dart | 2 +- .../performance/panes/frame_analysis/frame_analysis.dart | 2 +- .../screens/performance/panes/frame_analysis/frame_hints.dart | 2 +- .../panes/frame_analysis/frame_time_visualizer.dart | 2 +- .../performance/panes/rebuild_stats/rebuild_stats.dart | 2 +- .../panes/timeline_events/perfetto/_perfetto_desktop.dart | 2 +- .../panes/timeline_events/perfetto/_perfetto_web.dart | 2 +- .../performance/panes/timeline_events/perfetto/perfetto.dart | 2 +- .../panes/timeline_events/timeline_events_view.dart | 2 +- .../lib/src/screens/performance/performance_screen.dart | 2 +- .../lib/src/screens/performance/tabbed_performance_view.dart | 2 +- .../devtools_app/lib/src/screens/profiler/cpu_profiler.dart | 2 +- .../lib/src/screens/profiler/panes/bottom_up.dart | 2 +- .../lib/src/screens/profiler/panes/call_tree.dart | 2 +- .../profiler/panes/controls/cpu_profiler_controls.dart | 2 +- .../profiler/panes/controls/profiler_screen_controls.dart | 2 +- .../lib/src/screens/profiler/panes/cpu_flame_chart.dart | 2 +- .../lib/src/screens/profiler/panes/cpu_profile_columns.dart | 2 +- .../src/screens/profiler/panes/method_table/method_table.dart | 2 +- .../lib/src/screens/profiler/profiler_screen.dart | 2 +- .../lib/src/screens/profiler/profiler_status.dart | 2 +- .../lib/src/screens/provider/provider_screen.dart | 2 +- .../isolate_statistics/isolate_statistics_view.dart | 2 +- .../object_inspector/class_hierarchy_explorer.dart | 2 +- .../vm_developer/object_inspector/object_inspector_view.dart | 2 +- .../vm_developer/object_inspector/object_viewport.dart | 2 +- .../vm_developer/object_inspector/vm_class_display.dart | 2 +- .../vm_developer/object_inspector/vm_code_display.dart | 2 +- .../vm_developer/object_inspector/vm_field_display.dart | 2 +- .../vm_developer/object_inspector/vm_function_display.dart | 2 +- .../vm_developer/object_inspector/vm_ic_data_display.dart | 2 +- .../vm_developer/object_inspector/vm_instance_display.dart | 2 +- .../vm_developer/object_inspector/vm_library_display.dart | 2 +- .../vm_developer/object_inspector/vm_object_pool_display.dart | 2 +- .../vm_developer/object_inspector/vm_script_display.dart | 2 +- .../vm_developer/object_inspector/vm_simple_list_display.dart | 2 +- .../object_inspector/vm_unknown_object_display.dart | 2 +- .../vm_developer/process_memory/process_memory_view.dart | 2 +- .../queued_microtasks/queued_microtasks_view.dart | 2 +- .../src/screens/vm_developer/vm_developer_common_widgets.dart | 2 +- .../src/screens/vm_developer/vm_developer_tools_screen.dart | 2 +- .../vm_developer/vm_statistics/vm_statistics_view.dart | 2 +- .../lib/src/service/connected_app/connection_info.dart | 2 +- .../lib/src/service/service_extension_widgets.dart | 2 +- packages/devtools_app/lib/src/service/service_extensions.dart | 2 +- .../devtools_app/lib/src/service/service_registrations.dart | 2 +- packages/devtools_app/lib/src/shared/analytics/prompt.dart | 2 +- packages/devtools_app/lib/src/shared/charts/chart.dart | 2 +- .../devtools_app/lib/src/shared/charts/chart_controller.dart | 2 +- packages/devtools_app/lib/src/shared/charts/chart_trace.dart | 2 +- packages/devtools_app/lib/src/shared/charts/flame_chart.dart | 2 +- packages/devtools_app/lib/src/shared/charts/treemap.dart | 2 +- .../shared/config_specific/drag_and_drop/drag_and_drop.dart | 2 +- packages/devtools_app/lib/src/shared/console/console.dart | 2 +- .../lib/src/shared/console/widgets/console_pane.dart | 2 +- .../lib/src/shared/console/widgets/description.dart | 2 +- .../lib/src/shared/console/widgets/display_provider.dart | 2 +- .../devtools_app/lib/src/shared/console/widgets/evaluate.dart | 2 +- .../lib/src/shared/console/widgets/expandable_variable.dart | 2 +- .../lib/src/shared/console/widgets/help_dialog.dart | 2 +- packages/devtools_app/lib/src/shared/constants.dart | 2 +- .../lib/src/shared/diagnostics/diagnostics_node.dart | 2 +- .../lib/src/shared/diagnostics/inspector_service.dart | 2 +- .../environment_parameters/environment_parameters_base.dart | 2 +- .../environment_parameters_external.dart | 2 +- packages/devtools_app/lib/src/shared/framework/routing.dart | 2 +- packages/devtools_app/lib/src/shared/framework/screen.dart | 2 +- .../devtools_app/lib/src/shared/managers/banner_messages.dart | 2 +- .../devtools_app/lib/src/shared/managers/notifications.dart | 2 +- packages/devtools_app/lib/src/shared/memory/class_name.dart | 2 +- .../devtools_app/lib/src/shared/offline/offline_screen.dart | 2 +- .../lib/src/shared/primitives/collapsible_mixin.dart | 2 +- .../lib/src/shared/primitives/diagnostics_text_styles.dart | 2 +- .../primitives/flutter_widgets/linked_scroll_controller.dart | 2 +- packages/devtools_app/lib/src/shared/primitives/utils.dart | 2 +- packages/devtools_app/lib/src/shared/table/table.dart | 2 +- packages/devtools_app/lib/src/shared/table/table_data.dart | 2 +- packages/devtools_app/lib/src/shared/ui/colors.dart | 2 +- packages/devtools_app/lib/src/shared/ui/common_widgets.dart | 2 +- packages/devtools_app/lib/src/shared/ui/dialogs.dart | 2 +- packages/devtools_app/lib/src/shared/ui/drop_down_button.dart | 2 +- packages/devtools_app/lib/src/shared/ui/editable_list.dart | 2 +- packages/devtools_app/lib/src/shared/ui/file_import.dart | 2 +- packages/devtools_app/lib/src/shared/ui/filter.dart | 2 +- packages/devtools_app/lib/src/shared/ui/history_viewport.dart | 2 +- packages/devtools_app/lib/src/shared/ui/hover.dart | 2 +- packages/devtools_app/lib/src/shared/ui/icons.dart | 2 +- packages/devtools_app/lib/src/shared/ui/search.dart | 2 +- .../devtools_app/lib/src/shared/ui/search_highlighter.dart | 2 +- packages/devtools_app/lib/src/shared/ui/side_panel.dart | 2 +- packages/devtools_app/lib/src/shared/ui/tab.dart | 2 +- packages/devtools_app/lib/src/shared/ui/tree_view.dart | 2 +- packages/devtools_app/lib/src/shared/ui/utils.dart | 2 +- packages/devtools_app/lib/src/shared/ui/vm_flag_widgets.dart | 2 +- .../devtools_app/lib/src/shared/utils/profiler_utils.dart | 2 +- packages/devtools_app/lib/src/shared/utils/utils.dart | 2 +- .../src/standalone_ui/ide_shared/not_connected_overlay.dart | 2 +- .../ide_shared/property_editor/property_editor_inputs.dart | 2 +- .../ide_shared/property_editor/property_editor_messages.dart | 2 +- .../ide_shared/property_editor/property_editor_panel.dart | 2 +- .../ide_shared/property_editor/property_editor_refactors.dart | 2 +- .../ide_shared/property_editor/property_editor_view.dart | 2 +- .../devtools_app/lib/src/standalone_ui/standalone_screen.dart | 2 +- .../lib/src/standalone_ui/vs_code/debug_sessions.dart | 2 +- .../devtools_app/lib/src/standalone_ui/vs_code/devices.dart | 2 +- .../lib/src/standalone_ui/vs_code/devtools/devtools_view.dart | 2 +- .../src/standalone_ui/vs_code/devtools/extensions_view.dart | 2 +- .../lib/src/standalone_ui/vs_code/devtools/shared.dart | 2 +- .../lib/src/standalone_ui/vs_code/flutter_panel.dart | 2 +- packages/devtools_app/pubspec.yaml | 2 ++ .../devtools_app/test/extensions/extension_screen_test.dart | 2 +- .../devtools_app/test/extensions/extension_settings_test.dart | 2 +- packages/devtools_app/test/framework/home_screen_test.dart | 2 +- packages/devtools_app/test/framework/initializer_test.dart | 2 +- packages/devtools_app/test/framework/notifications_test.dart | 2 +- .../test/framework/observer/disconnect_observer_test.dart | 2 +- .../test/framework/scaffold/scaffold_debugger_test.dart | 2 +- .../framework/scaffold/scaffold_debugging_controls_test.dart | 2 +- .../test/framework/scaffold/scaffold_no_app_test.dart | 2 +- .../test/framework/scaffold/scaffold_profile_test.dart | 2 +- .../devtools_app/test/framework/scaffold/scaffold_test.dart | 2 +- .../test/screens/accessibility/accessibility_screen_test.dart | 2 +- .../test/screens/app_size/app_size_screen_test.dart | 2 +- .../test/screens/app_size/code_size_attribution_test.dart | 2 +- .../test/screens/cpu_profiler/cpu_profiler_test.dart | 2 +- .../screens/cpu_profiler/method_table/method_table_test.dart | 2 +- .../test/screens/cpu_profiler/profiler_screen_test.dart | 2 +- .../screens/debugger/debugger_codeview_statistics_test.dart | 2 +- .../test/screens/debugger/debugger_codeview_test.dart | 2 +- .../test/screens/debugger/debugger_console_test.dart | 2 +- .../screens/debugger/debugger_controls_overflow_test.dart | 2 +- .../test/screens/debugger/debugger_floating_test.dart | 2 +- .../screens/debugger/debugger_screen_breakpoints_test.dart | 2 +- .../screens/debugger/debugger_screen_call_stack_test.dart | 2 +- .../screens/debugger/debugger_screen_dap_variables_test.dart | 2 +- .../debugger/debugger_screen_explorer_visibility_test.dart | 2 +- .../test/screens/debugger/debugger_screen_paused_test.dart | 2 +- .../test/screens/debugger/debugger_screen_test.dart | 2 +- .../test/screens/debugger/debugger_screen_variables_test.dart | 2 +- .../test/screens/debugger/debugger_scripts_test.dart | 2 +- .../devtools_app/test/screens/debugger/eval_field_test.dart | 2 +- .../devtools_app/test/screens/debugger/file_search_test.dart | 2 +- .../test/screens/debugger/program_explorer_test.dart | 2 +- .../test/screens/debugger/syntax_highlighter_test.dart | 4 ++-- .../screens/deep_link_validation/deep_links_screen_test.dart | 2 +- .../deep_link_validation/select_project_view_test.dart | 2 +- .../devtools_app/test/screens/dtd/dtd_tools_screen_test.dart | 2 +- packages/devtools_app/test/screens/dtd/events_test.dart | 2 +- packages/devtools_app/test/screens/dtd/services_test.dart | 2 +- .../devtools_app/test/screens/inspector/diagnostics_test.dart | 2 +- .../screens/inspector/inspector_error_navigator_test.dart | 2 +- .../test/screens/inspector/inspector_integration_test.dart | 2 +- .../test/screens/inspector/inspector_screen_test.dart | 2 +- .../test/screens/inspector/inspector_tree_test.dart | 2 +- .../screens/inspector/layout_explorer/flex/arrow_test.dart | 2 +- .../screens/inspector/layout_explorer/flex/flex_test.dart | 2 +- .../inspector/layout_explorer/inspector_data_models_test.dart | 2 +- .../inspector/layout_explorer/layout_explorer_test_utils.dart | 2 +- .../test/screens/inspector/utils/inspector_tree.dart | 2 +- .../inspector/widget_creation_location_trailing_test.dart | 2 +- .../test/screens/logging/logging_screen_data_test.dart | 2 +- .../test/screens/logging/logging_screen_test.dart | 2 +- packages/devtools_app/test/screens/logging/metadata_test.dart | 2 +- .../devtools_app/test/screens/memory/chart/chart_test.dart | 2 +- .../test/screens/memory/control/settings_dialog_test.dart | 2 +- .../memory/diff/controller/diff_pane_controller_test.dart | 2 +- .../test/screens/memory/diff/widgets/class_filter_test.dart | 2 +- .../test/screens/memory/diff/widgets/diff_pane_test.dart | 2 +- .../test/screens/memory/framework/memory_controller_test.dart | 2 +- .../test/screens/memory/framework/memory_screen_test.dart | 2 +- .../memory/profile/allocation_profile_table_view_test.dart | 2 +- .../test/screens/memory/tracing/tracing_view_test.dart | 2 +- .../test/screens/network/network_profiler_test.dart | 2 +- .../test/screens/network/network_request_inspector_test.dart | 2 +- .../test/screens/network/network_screen_test.dart | 2 +- .../screens/performance/controls/enhance_tracing_test.dart | 2 +- .../performance/controls/performance_controls_test.dart | 2 +- .../performance/flutter_frames/flutter_frames_chart_test.dart | 2 +- .../performance/frame_analysis/frame_analysis_test.dart | 2 +- .../screens/performance/frame_analysis/frame_hints_test.dart | 2 +- .../test/screens/performance/performance_screen_test.dart | 2 +- .../screens/performance/tabbed_performance_view_test.dart | 2 +- .../object_inspector/object_inspector_view_test.dart | 2 +- .../vm_developer/object_inspector/vm_class_display_test.dart | 2 +- .../vm_developer/object_inspector/vm_code_display_test.dart | 2 +- .../object_inspector/vm_developer_common_widgets_test.dart | 2 +- .../vm_developer/object_inspector/vm_field_display_test.dart | 2 +- .../object_inspector/vm_function_display_test.dart | 2 +- .../object_inspector/vm_ic_data_display_test.dart | 2 +- .../object_inspector/vm_library_display_test.dart | 2 +- .../object_inspector/vm_object_pool_display_test.dart | 2 +- .../vm_developer/object_inspector/vm_script_display_test.dart | 2 +- .../object_inspector/vm_simple_list_display_test.dart | 2 +- .../queued_microtasks/queued_microtasks_view_test.dart | 2 +- packages/devtools_app/test/service/connection_info_test.dart | 2 +- .../test/service/service_extension_widgets_test.dart | 2 +- .../test/shared/analytics/analytics_prompt_test.dart | 2 +- packages/devtools_app/test/shared/ansi_output_test.dart | 2 +- .../devtools_app/test/shared/charts/flame_chart_test.dart | 2 +- packages/devtools_app/test/shared/charts/treemap_test.dart | 2 +- packages/devtools_app/test/shared/framework/routing_test.dart | 2 +- packages/devtools_app/test/shared/framework/screens_test.dart | 2 +- .../test/shared/managers/banner_messages_test.dart | 2 +- .../test/shared/primitives/linked_scroll_controller_test.dart | 2 +- packages/devtools_app/test/shared/primitives/utils_test.dart | 2 +- packages/devtools_app/test/shared/table/table_test.dart | 2 +- packages/devtools_app/test/shared/ui/auto_complete_test.dart | 2 +- packages/devtools_app/test/shared/ui/common_widgets_test.dart | 2 +- packages/devtools_app/test/shared/ui/editable_list_test.dart | 2 +- .../devtools_app/test/shared/ui/hover_positioning_test.dart | 2 +- .../devtools_app/test/shared/ui/search_highlighter_test.dart | 2 +- packages/devtools_app/test/shared/ui/search_test.dart | 2 +- packages/devtools_app/test/shared/ui/side_panel_test.dart | 2 +- packages/devtools_app/test/shared/ui/ui_utils_test.dart | 2 +- .../devtools_app/test/shared/ui/vm_flag_widgets_test.dart | 2 +- .../ide_shared/property_editor/property_editor_test.dart | 2 +- .../standalone_ui/ide_shared/property_editor/utils_test.dart | 2 +- .../test/standalone_ui/vs_code/debug_sessions_test.dart | 2 +- .../test/standalone_ui/vs_code/devtools_test.dart | 2 +- .../test_infra/fixtures/custom_widgets/lib/src/widgets.dart | 2 +- .../test/test_infra/fixtures/custom_widgets/pubspec.yaml | 1 + .../test/test_infra/fixtures/flutter_app/lib/main.dart | 2 +- .../fixtures/flutter_app/lib/src/other_classes.dart | 2 +- .../test/test_infra/fixtures/flutter_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/flutter_error_app/lib/main.dart | 2 +- .../flutter_error_app/lib/missing_material_error.dart | 2 +- .../test/test_infra/fixtures/flutter_error_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/inspector_app/lib/main.dart | 2 +- .../fixtures/inspector_app/lib/overflow_errors.dart | 2 +- .../test/test_infra/fixtures/inspector_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/memory_app/lib/main.dart | 2 +- .../test/test_infra/fixtures/memory_app/pubspec.yaml | 1 + .../test/test_infra/scenes/cpu_profiler/default.dart | 2 +- packages/devtools_app/test/test_infra/scenes/hello.dart | 2 +- .../devtools_app/test/test_infra/scenes/memory/default.dart | 2 +- .../test/test_infra/scenes/memory/diff_snapshot.dart | 2 +- .../test/test_infra/scenes/performance/default.dart | 2 +- .../test/test_infra/scenes/scene_test_extensions.dart | 2 +- .../test/test_infra/scenes/standalone_ui/editor_sidebar.dart | 2 +- .../test_infra/scenes/standalone_ui/mock_editor_widget.dart | 2 +- .../scenes/standalone_ui/property_editor_sidebar.dart | 2 +- .../test_infra/scenes/standalone_ui/shared/common_ui.dart | 2 +- .../devtools_app/test/test_infra/utils/debugger_utils.dart | 2 +- 364 files changed, 366 insertions(+), 359 deletions(-) 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 565d51b2297..48f79da8e02 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class CpuProfilerScreenAutomator { 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 fee360f5bdd..0615831f3c8 100644 --- a/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart +++ b/packages/devtools_app/benchmark/test_infra/automators/_performance_automator.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class PerformanceScreenAutomator { 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 2dfd7e91302..445603502bf 100644 --- a/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart +++ b/packages/devtools_app/benchmark/test_infra/automators/devtools_automator.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:web_benchmarks/client.dart'; diff --git a/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart b/packages/devtools_app/benchmark/test_infra/devtools_recorder.dart index f28a87162a9..568cae46ec0 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/integration_test/test/live_connection/debugger_panel_test.dart b/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart index 5321b55ba02..fef87631779 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_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 2792f16398d..8bca95a9167 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,7 +19,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_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 2753d9704ad..a22a073a8a3 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,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// Prepares the UI of the memory screen for an integration test. 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 dd34a1c8811..aa623450ba7 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,7 +6,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:vm_service_protos/vm_service_protos.dart'; 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 f2fb3c30ed7..f67ec1101c4 100644 --- a/packages/devtools_app/integration_test/test/offline/perfetto_test.dart +++ b/packages/devtools_app/integration_test/test/offline/perfetto_test.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/packages/devtools_app/lib/initialization.dart b/packages/devtools_app/lib/initialization.dart index 1696215fab3..a64063f46f2 100644 --- a/packages/devtools_app/lib/initialization.dart +++ b/packages/devtools_app/lib/initialization.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:devtools_app_shared/utils.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_web_plugins/url_strategy.dart'; import 'src/app.dart'; diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart index b948d84edec..21122e9155d 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/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'; 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 051461bbbe0..bdada546e0c 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 79017530a1b..fd7ffde8538 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_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'; diff --git a/packages/devtools_app/lib/src/extensions/embedded/view.dart b/packages/devtools_app/lib/src/extensions/embedded/view.dart index f8563f42830..6fa5e13484b 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 3d0bb61dae1..b899197e5c1 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 813e183999b..a235f911cfb 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 '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; diff --git a/packages/devtools_app/lib/src/extensions/extension_settings.dart b/packages/devtools_app/lib/src/extensions/extension_settings.dart index fa2dd8aa16f..6bd82fd2539 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 '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; diff --git a/packages/devtools_app/lib/src/framework/home_screen.dart b/packages/devtools_app/lib/src/framework/home_screen.dart index 6da52cb81d1..08b99ab55ca 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/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'; diff --git a/packages/devtools_app/lib/src/framework/initializer.dart b/packages/devtools_app/lib/src/framework/initializer.dart index 8bc2760a6a4..817efc678ba 100644 --- a/packages/devtools_app/lib/src/framework/initializer.dart +++ b/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; diff --git a/packages/devtools_app/lib/src/framework/notifications_view.dart b/packages/devtools_app/lib/src/framework/notifications_view.dart index e3c2331ae27..825e6b758d6 100644 --- a/packages/devtools_app/lib/src/framework/notifications_view.dart +++ b/packages/devtools_app/lib/src/framework/notifications_view.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:flutter/scheduler.dart'; import '../shared/globals.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 8a46105c6d2..bef72ffe7bd 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 '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; 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 9618a6d57d5..b1e2d267ac8 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 '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; diff --git a/packages/devtools_app/lib/src/framework/release_notes.dart b/packages/devtools_app/lib/src/framework/release_notes.dart index f7632c6eaf0..40075655f50 100644 --- a/packages/devtools_app/lib/src/framework/release_notes.dart +++ b/packages/devtools_app/lib/src/framework/release_notes.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; 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 2a31c09ed53..b86833d9337 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 55ba3916926..72baad32a73 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 bba85e2633b..8b1e5bb7cb5 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 447fc32c0d0..252c62cb8ea 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 0b09230f689..90b3e884ffe 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 6bef59f0d58..b957df2f7f7 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 114444db546..a292d6ef68c 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 2134b20666f..f32e71e97a8 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 f50ee3ab5f5..9e2555ac122 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 9b9700742cb..4e580650038 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 f32897995b6..68bce8a3417 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 '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; 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 9e06c28ffc3..3386b1718bb 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 739905bb3e7..913e46a4488 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 b54f602af8a..7dab8a280d3 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 eaa2d239982..0aafe12860b 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 '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'; diff --git a/packages/devtools_app/lib/src/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart index d5f1ebd54da..40484e84455 100644 --- a/packages/devtools_app/lib/src/screens/debugger/codeview.dart +++ b/packages/devtools_app/lib/src/screens/debugger/codeview.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; diff --git a/packages/devtools_app/lib/src/screens/debugger/common.dart b/packages/devtools_app/lib/src/screens/debugger/common.dart index 8ef93fb0838..fab3c2b8fe7 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 44e211c34f0..206ce4b2711 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 '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; 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 80745175e6f..18ad76ebe64 100644 --- a/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart +++ b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart @@ -8,7 +8,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' hide Stack; +import 'package:material_ui/material_ui.dart' hide Stack; import 'package:flutter/scheduler.dart'; import 'package:vm_service/vm_service.dart'; 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 f32f6e5f769..da9e5024d0c 100644 --- a/packages/devtools_app/lib/src/screens/debugger/file_search.dart +++ b/packages/devtools_app/lib/src/screens/debugger/file_search.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/utils.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:vm_service/vm_service.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 9efc9bd576e..83f6a44735c 100644 --- a/packages/devtools_app/lib/src/screens/debugger/key_sets.dart +++ b/packages/devtools_app/lib/src/screens/debugger/key_sets.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:flutter/services.dart'; import '../../shared/config_specific/host_platform/host_platform.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 dc602fa7ac6..71e6d96beee 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 'dart:async'; 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 80db5b5e45e..f64b3ca2120 100644 --- a/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart +++ b/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart @@ -5,7 +5,7 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:logging/logging.dart'; diff --git a/packages/devtools_app/lib/src/screens/debugger/variables.dart b/packages/devtools_app/lib/src/screens/debugger/variables.dart index 6eda6adaaae..4f346c16370 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 30ef0e59793..a6130c884b0 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 4464b8c2a09..992798dc810 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 'dart:math'; 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 7d035f1b04e..2eae88e0041 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 a54110953f7..d8556a8f9cf 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 891ebc15cf0..33085ceed36 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 d022c479d44..da490861ab4 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 'dart:async'; 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 cd5c3d964d9..1fb5fd1dd53 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 46779d295af..cf74e65e6e3 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 'dart:async'; 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 e00539f25f0..ac34dcb38dc 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 8ff13fafd2b..76c98ba7947 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 'dart:convert'; 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 bf772c4a70c..b39569fcc6a 100644 --- a/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart +++ b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart @@ -18,7 +18,7 @@ import 'dart:async'; 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:logging/logging.dart'; import 'package:vm_service/vm_service.dart'; 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 cdb8cec00c6..951a93f7040 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 9db58faf8b8..799abb0e871 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 67403c57e13..855e57a35a5 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 'dart:collection'; 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 a185822be0f..8401ec5104a 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 '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_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 fee0b94e774..d1b858dfadf 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,7 +9,7 @@ import 'dart: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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; 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 b11a6ff2aa7..fbd2d023b3e 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 dd16fdec685..964f30fe5f7 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:async'; 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 5e67d1e3117..e4a19deed8d 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,7 +4,7 @@ import 'dart:ui'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/widgets.dart'; import '../../inspector_data_models.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 6035809f3a8..786a96ed4b1 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 7dfb1b8e2c1..fec202b9ccb 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 aeb3766ae9e..7801196d358 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 9c8bf182944..55f7f0fc24c 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,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:flutter/widgets.dart'; import '../../../../shared/diagnostics/diagnostics_node.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 4a1b947a931..80626ffc8b6 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 859b6508cad..40ca5f48e8a 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 465a2cb6440..87e8e5ca6bf 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 c0a76886c8a..c78d2051ce2 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 9a339db2f8b..49b0bce21c2 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 'dart:math'; 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 19cba6690c1..452293c126b 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 '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/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 2643f2f06a6..28952153102 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 96a6c916e70..ead7f9fa0c4 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 ff52b5cb601..4b34c82c354 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 87adecacab6..cc4901a83cc 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 081762ca4ef..30ef7b64581 100644 --- a/packages/devtools_app/lib/src/screens/logging/metadata.dart +++ b/packages/devtools_app/lib/src/screens/logging/metadata.dart @@ -6,7 +6,7 @@ import 'dart:convert'; 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:logging/logging.dart'; import 'package:vm_service/vm_service.dart' show EventKind; 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 cd6dccf5ce7..e215fb24c75 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 ccce88cf564..2a647ab6569 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 d2389f1cf90..470c7312a14 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 247615b6eae..4702fe72cf1 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 29bbf2e95eb..9e35f66545e 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 a84a8dc67aa..25735607a12 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 08273b61b4b..0ea8e170120 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 de7fe0fa695..d19f6e5be97 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 1a5f0e243b8..92886568185 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,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 'package:flutter/services.dart'; import '../../../../../shared/charts/chart_controller.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 9773fcc5ab6..f601170f086 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 5c43dd6c3e6..13189419893 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 ec4dc81c3f9..348a0ccf8c2 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/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 '../../../../../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 334d9c3dbcd..3ebac1c62e0 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 4b702790e2d..dd5a5efe072 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 af539bd9d45..2951c8a8551 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 'dart:async'; 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 196fd1ce6b3..adf3e346171 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 2342b95fc20..df79c5a31e5 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,7 +6,7 @@ import 'dart:async'; 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 'package:flutter_markdown/flutter_markdown.dart'; import '../../../../shared/analytics/constants.dart' as gac; 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 7821f0c3bbb..e43e502d355 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 a40c9ebc2e2..cfc008b89fe 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 24b9cebbdd1..460ebf9d572 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 eb2b1b61774..d33a600fa75 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 a1da1ad78c3..5c457c1d545 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 63f7554fa14..4317233c5fc 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,7 +7,7 @@ import 'dart:async'; 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:logging/logging.dart'; import '../../../../../shared/analytics/analytics.dart' as ga; 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 090d1006c23..283cc5c19a4 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 9aa189480b3..0d49fc37ece 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 ed4637b5db2..0465b9f6daf 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 2d342d1d4e5..329500046fc 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 981ebf06aab..a1bc4958c93 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,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:flutter_markdown/flutter_markdown.dart'; import '../../../../shared/analytics/constants.dart' as gac; 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 e923d9c7012..9b0ebabd9e5 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 5c3fa7d1895..af3fee85298 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 91b9c2b5782..0e9c0d7297e 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 3374785c762..586d503c7c9 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 c5a918c7031..1f1751697bf 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 5297d7b275e..da3bf207a5e 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 1567b4fbf81..87698f22eef 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,7 +6,7 @@ import 'dart:convert'; 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 'package:image/image.dart' as image; import '../../shared/http/http.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 5006eee4b61..9721eaa96aa 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 '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: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 1e708a31f77..eebec44b2ea 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 '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/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 fe865ae1319..1f36790cefd 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 66953bd5b9b..d1d5ba807c9 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 f6db51401be..fe1a73593d1 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 27e5ccedf89..ce015a0808e 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 '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: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 4ebc6896ea3..e9b513104bc 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 1bb06ddbc88..f77a19f7374 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 @@ library; 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 b0c09e8f56f..d9e8c612c71 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 'dart:math' as math; 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 a19d2502276..4ae2ade57d7 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/service.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 '../../../../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 7f0881ab4b4..de792cf4ee8 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 22842170d60..4f36b7068cb 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,7 +10,7 @@ import 'dart:typed_data'; 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:material_ui/material_ui.dart'; import 'package:logging/logging.dart'; import 'package:web/web.dart'; 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 fff957cf6a4..0e7d03d6434 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 682b3702817..0b75ef2ea1c 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 '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/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 ac10baf610d..ee8202fba7a 100644 --- a/packages/devtools_app/lib/src/screens/performance/performance_screen.dart +++ b/packages/devtools_app/lib/src/screens/performance/performance_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:flutter_markdown/flutter_markdown.dart'; import 'package:provider/provider.dart'; 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 a6fd9887d2a..793daa3d161 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 'dart:async'; 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 cf2b32f0b23..969f5dc5474 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 '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/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 d240dfebb13..615ed41cdca 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 1169427a81c..1c63746b3e2 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 642b4e928d6..db6894bd1cb 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 c1c5b244514..8a0082c83cd 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 f0fc0d023dd..d3b72c341d0 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 b2a97206424..77b4da48345 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 589e36d0385..e2b018b659b 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 ae60c9aa1c8..df33371c5a6 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 f4fd5aeacb9..3bf5028e1fd 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 027ee4eda19..4aa9703f423 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 5c25fede612..094d528a6a9 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,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 'package:intl/intl.dart'; import 'package:vm_service/vm_service.dart'; 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 08cd597357e..8465be22811 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 277e7dd99a7..b4711b5fc6f 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 37084d17a67..67a4512fb93 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 cf01742658e..4ea3e7795c1 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 0e24710b7c8..095ca1cc81a 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 c30182d6407..3e88cd3f336 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 dfbbb8e41f2..fbc28cd878b 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 c718d5368d9..8270b4281ba 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 8bd7e660189..7c2f36b922d 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 faa3d3efb42..4d1a3355e41 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 0f10967d25e..c2d763ba603 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 5063de46dec..ad008b4bc9f 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 bde64b1ab15..74b9a5f51da 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 9ed7fdfede5..b3bfcef23b4 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 2fb5ad78131..d970490433a 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 692c48e65a5..a75d25d4257 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,7 +4,7 @@ import 'package:collection/collection.dart' show ListExtensions; import 'package:devtools_app_shared/ui.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:intl/intl.dart' show DateFormat; import 'package:vm_service/vm_service.dart'; 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 06f7f6c9914..88d62888cf1 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/ui.dart'; 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 e544efde766..ded2471ed0b 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 a2b9d49ceac..c25fd1ccac1 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 c651fe0a885..f38abae5922 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 10fab338b7a..e24cfe740bc 100644 --- a/packages/devtools_app/lib/src/service/service_extension_widgets.dart +++ b/packages/devtools_app/lib/src/service/service_extension_widgets.dart @@ -13,7 +13,7 @@ import 'package:devtools_app_shared/ui.dart'; 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:logging/logging.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; diff --git a/packages/devtools_app/lib/src/service/service_extensions.dart b/packages/devtools_app/lib/src/service/service_extensions.dart index c4fd56a4f0a..4057d9499ee 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 958e071cae3..188cd54e5d4 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 9b4aca268b9..af89a28b63a 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 6c93000254e..9bab7a0273f 100644 --- a/packages/devtools_app/lib/src/shared/charts/chart.dart +++ b/packages/devtools_app/lib/src/shared/charts/chart.dart @@ -7,7 +7,7 @@ import 'dart:ui'; 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:logging/logging.dart'; import '../primitives/utils.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 923ac1b2630..7f8fa379e57 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 5e1ab4959ea..c13d67930d5 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 26aa5d80cc4..008f2b18ae7 100644 --- a/packages/devtools_app/lib/src/shared/charts/flame_chart.dart +++ b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart @@ -10,7 +10,7 @@ import 'package:devtools_app_shared/ui.dart'; 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:flutter/services.dart'; import '../primitives/extent_delegate_list.dart'; diff --git a/packages/devtools_app/lib/src/shared/charts/treemap.dart b/packages/devtools_app/lib/src/shared/charts/treemap.dart index f6a77d5c415..dae9c34600e 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 9ba1f8f0aeb..54a69e31e06 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,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:flutter/rendering.dart'; import '../../primitives/utils.dart'; diff --git a/packages/devtools_app/lib/src/shared/console/console.dart b/packages/devtools_app/lib/src/shared/console/console.dart index 30e9913ae67..53a8adca1f3 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 'dart:async'; 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 4d661cc881d..a8ffe08a7a2 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 2344aed2cce..92472a2baf3 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 91fd7ac7fee..24d4df082e4 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,7 +6,7 @@ import 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart' hide Stack; +import 'package:material_ui/material_ui.dart' hide Stack; import 'package:flutter/services.dart'; import 'package:vm_service/vm_service.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 ea2437306cd..d223688ffa5 100644 --- a/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart +++ b/packages/devtools_app/lib/src/shared/console/widgets/evaluate.dart @@ -7,7 +7,7 @@ import 'dart:math'; 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:flutter/services.dart'; import 'package:vm_service/vm_service.dart'; 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 58f1dcbad8b..9004fe125c6 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 96d35b1545a..ce6c843c90f 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 36c55461073..0a999b2b545 100644 --- a/packages/devtools_app/lib/src/shared/constants.dart +++ b/packages/devtools_app/lib/src/shared/constants.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:logging/logging.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 032080ababb..c66b0b5c188 100644 --- a/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart +++ b/packages/devtools_app/lib/src/shared/diagnostics/diagnostics_node.dart @@ -11,7 +11,7 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:vm_service/vm_service.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 6081c5d09b5..ad930c7da4f 100644 --- a/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart +++ b/packages/devtools_app/lib/src/shared/diagnostics/inspector_service.dart @@ -18,7 +18,7 @@ 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:cupertino_ui/cupertino_ui.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 e960fa1bb70..ed2a4c2b70d 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 d46afca09e1..a8f551c3f9e 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 5de3eabe6d6..201272d7d51 100644 --- a/packages/devtools_app/lib/src/shared/framework/routing.dart +++ b/packages/devtools_app/lib/src/shared/framework/routing.dart @@ -7,7 +7,7 @@ import 'dart:collection'; 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:flutter/services.dart'; import '../../framework/framework_core.dart'; diff --git a/packages/devtools_app/lib/src/shared/framework/screen.dart b/packages/devtools_app/lib/src/shared/framework/screen.dart index 32f3d21e4bb..ca794a3bd5d 100644 --- a/packages/devtools_app/lib/src/shared/framework/screen.dart +++ b/packages/devtools_app/lib/src/shared/framework/screen.dart @@ -12,7 +12,7 @@ import 'package:devtools_app_shared/service.dart'; 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 'package:logging/logging.dart'; import '../globals.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 d9c32156880..28c41091ca1 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/ui.dart'; 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 8c15cebf570..ff1edf42951 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:async'; 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 c966b4c8a7c..2942d6e8c1c 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 cca7d0f6213..ae0896b068b 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 1bdf7c9277f..f00216af85c 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 5773f02f3c2..44c15bbecb1 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 391d7cfacb0..122e8d0c7fa 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,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:flutter/rendering.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 d09c45a3a5b..b252d764ca3 100644 --- a/packages/devtools_app/lib/src/shared/primitives/utils.dart +++ b/packages/devtools_app/lib/src/shared/primitives/utils.dart @@ -11,7 +11,7 @@ import 'dart:math'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:intl/intl.dart'; diff --git a/packages/devtools_app/lib/src/shared/table/table.dart b/packages/devtools_app/lib/src/shared/table/table.dart index 19da2a152a2..a9a7d8b7fa2 100644 --- a/packages/devtools_app/lib/src/shared/table/table.dart +++ b/packages/devtools_app/lib/src/shared/table/table.dart @@ -8,7 +8,7 @@ import 'dart: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' hide TableRow; +import 'package:material_ui/material_ui.dart' hide TableRow; import 'package:flutter/services.dart'; import '../primitives/collapsible_mixin.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 93baa7a9b2c..be4b891f15b 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 a330946505b..adb1829655d 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 d26a6cb4487..c3cc91d9bf3 100644 --- a/packages/devtools_app/lib/src/shared/ui/common_widgets.dart +++ b/packages/devtools_app/lib/src/shared/ui/common_widgets.dart @@ -9,7 +9,7 @@ import 'dart: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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:vm_service/vm_service.dart'; diff --git a/packages/devtools_app/lib/src/shared/ui/dialogs.dart b/packages/devtools_app/lib/src/shared/ui/dialogs.dart index d87c7ff18d2..c14ab480e65 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 1fcfd0bea65..ececdc4b3b4 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 392950b5803..324b6ffb68a 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 'dart:async'; 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 3a425f6cc6d..a0b9135455f 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 'dart:convert'; 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 7ec4eacda1a..8ac8d2f3a4e 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 'dart:convert'; 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 aad6cf45fde..1caf1db5163 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 47e0048c3bd..a77536c639f 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 'dart:math' as math; 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 543b0cb5d9b..18e58cc2ec2 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 573d0e016cc..ad823aa2881 100644 --- a/packages/devtools_app/lib/src/shared/ui/search.dart +++ b/packages/devtools_app/lib/src/shared/ui/search.dart @@ -9,7 +9,7 @@ import 'package:async/async.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:flutter/services.dart'; import 'package:logging/logging.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 6c93155edc8..23d091189da 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 9174f9296b3..45feb3a4eeb 100644 --- a/packages/devtools_app/lib/src/shared/ui/side_panel.dart +++ b/packages/devtools_app/lib/src/shared/ui/side_panel.dart @@ -8,7 +8,7 @@ import 'dart: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:material_ui/material_ui.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import '../primitives/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 07cb85acfcc..cf140cc68ef 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 222ad382212..603ae3da3ab 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 'dart:async'; 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 56f428f31f9..51ba2679695 100644 --- a/packages/devtools_app/lib/src/shared/ui/utils.dart +++ b/packages/devtools_app/lib/src/shared/ui/utils.dart @@ -7,7 +7,7 @@ import 'dart:math'; 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:flutter/scheduler.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 8ddbce44500..3cb9e094084 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 '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_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 da457651dd9..329de586a51 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 2d797672b94..eaa8772d340 100644 --- a/packages/devtools_app/lib/src/shared/utils/utils.dart +++ b/packages/devtools_app/lib/src/shared/utils/utils.dart @@ -13,7 +13,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/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:logging/logging.dart'; 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 0a67722ffdd..8ac63da31ab 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 9d01365c63d..831a296e492 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,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:flutter/services.dart'; import '../../../shared/analytics/analytics.dart' as ga; 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 e3cf4530149..102e7461d59 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 bde7dd009f3..da6dda6a7eb 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 '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 '../../../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 9fa2ff7a59a..0ac520283d6 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 ed46149c773..10e5ae6f027 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 '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/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 7cb0792c671..e22836779c0 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 79ec9914063..7ec71d85125 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 6718b5ab4e6..645d30e7db4 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 9d01c673aee..55bba2578a0 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 b6b4b7340f3..27598a6287e 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 'dart:async'; 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 e64162aef13..c97ec1532f5 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 c6704edf084..ddac8714b56 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 '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 '../../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 a95b396cb89..f341f056962 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -59,6 +59,8 @@ dependencies: vm_snapshot_analysis: ^0.7.6 web: ^1.0.0 + material_ui: any + cupertino_ui: any dev_dependencies: args: ^2.4.2 benchmark_harness: ^2.3.1 diff --git a/packages/devtools_app/test/extensions/extension_screen_test.dart b/packages/devtools_app/test/extensions/extension_screen_test.dart index f0f9cc056de..243975131f0 100644 --- a/packages/devtools_app/test/extensions/extension_screen_test.dart +++ b/packages/devtools_app/test/extensions/extension_screen_test.dart @@ -12,7 +12,7 @@ import 'package:devtools_app_shared/ui.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/devtools_app/test/extensions/extension_settings_test.dart b/packages/devtools_app/test/extensions/extension_settings_test.dart index 9c5ac53e4dd..53d79c1aedd 100644 --- a/packages/devtools_app/test/extensions/extension_settings_test.dart +++ b/packages/devtools_app/test/extensions/extension_settings_test.dart @@ -11,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/framework/home_screen_test.dart b/packages/devtools_app/test/framework/home_screen_test.dart index 0036d28a66d..eedd4bc0a2d 100644 --- a/packages/devtools_app/test/framework/home_screen_test.dart +++ b/packages/devtools_app/test/framework/home_screen_test.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/framework/initializer_test.dart b/packages/devtools_app/test/framework/initializer_test.dart index e45135ececd..2101f345997 100644 --- a/packages/devtools_app/test/framework/initializer_test.dart +++ b/packages/devtools_app/test/framework/initializer_test.dart @@ -9,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/framework/notifications_test.dart b/packages/devtools_app/test/framework/notifications_test.dart index 89b684725bc..359825c7418 100644 --- a/packages/devtools_app/test/framework/notifications_test.dart +++ b/packages/devtools_app/test/framework/notifications_test.dart @@ -9,7 +9,7 @@ import 'package:devtools_app/src/shared/globals.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 1c186ad4964..f41a395a266 100644 --- a/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart +++ b/packages/devtools_app/test/framework/observer/disconnect_observer_test.dart @@ -10,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f6ae6d744d5..dec33a1cf27 100644 --- a/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart +++ b/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart @@ -11,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 a6489ed0c8a..0b3ef5e092c 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,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 a686d5ac3a3..e57e6b266da 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,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 2722d8d300a..d133f2e25dc 100644 --- a/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart +++ b/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart @@ -11,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/framework/scaffold/scaffold_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_test.dart index 434ec2a8944..c6748422356 100644 --- a/packages/devtools_app/test/framework/scaffold/scaffold_test.dart +++ b/packages/devtools_app/test/framework/scaffold/scaffold_test.dart @@ -16,7 +16,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 337d24e521c..582026ef150 100644 --- a/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart +++ b/packages/devtools_app/test/screens/accessibility/accessibility_screen_test.dart @@ -12,7 +12,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 135127828e7..751c6e3cc9b 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,7 +12,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 575251f3cbf..d76303bbcc8 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 65ef96b5b65..bb23f76fa7f 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,7 +18,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 d347b7698e6..2d2d3acdff9 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,7 +12,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 01d911527e9..7c551a359b9 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,7 +11,7 @@ import 'package:devtools_app/src/shared/ui/file_import.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../test_infra/scenes/cpu_profiler/default.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 56e199fb031..38d54b95407 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,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 db88c2f5eb4..49b74e9f102 100644 --- a/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart +++ b/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart @@ -10,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 392bc0db2e4..908725e5654 100644 --- a/packages/devtools_app/test/screens/debugger/debugger_console_test.dart +++ b/packages/devtools_app/test/screens/debugger/debugger_console_test.dart @@ -9,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 729f55039af..f5c2f123f80 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,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 06185005851..aa906215c44 100644 --- a/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart +++ b/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 90594f9ccc1..a7ea1a13f54 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 9d697fed40b..f830b987aa9 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f227f29a9f7..5805550866c 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 29d92c2e030..3c3199958af 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,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 8507c46016d..c12cd560b3e 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 daa2f649724..0c4d12a5d5f 100644 --- a/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart +++ b/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart @@ -11,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 21464355d0d..08c39ca20f0 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,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 213c80f87c4..0bc7042b0fe 100644 --- a/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart +++ b/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart @@ -10,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 959cb92a901..86f075a0fa0 100644 --- a/packages/devtools_app/test/screens/debugger/eval_field_test.dart +++ b/packages/devtools_app/test/screens/debugger/eval_field_test.dart @@ -10,7 +10,7 @@ import 'package:devtools_app/src/shared/ui/search.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; 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 7693fde1d81..eac42737bd0 100644 --- a/packages/devtools_app/test/screens/debugger/file_search_test.dart +++ b/packages/devtools_app/test/screens/debugger/file_search_test.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 189a7f561df..21f6724267c 100644 --- a/packages/devtools_app/test/screens/debugger/program_explorer_test.dart +++ b/packages/devtools_app/test/screens/debugger/program_explorer_test.dart @@ -10,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 b8b8fc1464c..1fdbca653ec 100644 --- a/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart +++ b/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart @@ -15,8 +15,8 @@ import 'package:devtools_app/src/shared/ui/colors.dart'; 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:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; const modifierSpans = [ 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 e94daac714d..e19a2eeb2d6 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,7 +17,7 @@ import 'package:devtools_shared/devtools_deeplink.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 7602c18c4fb..338a3f0ff37 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,7 +12,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 b7053212220..646c45b0d3c 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,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/screens/dtd/events_test.dart b/packages/devtools_app/test/screens/dtd/events_test.dart index 1bae605fcbe..6368a0ea7c6 100644 --- a/packages/devtools_app/test/screens/dtd/events_test.dart +++ b/packages/devtools_app/test/screens/dtd/events_test.dart @@ -11,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/screens/dtd/services_test.dart b/packages/devtools_app/test/screens/dtd/services_test.dart index ab30f562503..f17d1882f57 100644 --- a/packages/devtools_app/test/screens/dtd/services_test.dart +++ b/packages/devtools_app/test/screens/dtd/services_test.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:dtd/dtd.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/screens/inspector/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart index 97f24b660f7..c9ca9fe92bf 100644 --- a/packages/devtools_app/test/screens/inspector/diagnostics_test.dart +++ b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart @@ -11,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 0d339af4902..cf5ad047a9c 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 @@ -11,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 3f09b29eb1f..ff945e5e299 100644 --- a/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart +++ b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart @@ -15,7 +15,7 @@ import 'package:devtools_app/src/shared/ui/tab.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:path/path.dart' as p; 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 32cebaa6212..c7fd2ba069e 100644 --- a/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart +++ b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart @@ -18,7 +18,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart' hide Fake; import 'package:mockito/mockito.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 c6ae0e91bcf..2bba15a848d 100644 --- a/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart +++ b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart' hide Fake; import 'package:mockito/mockito.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 2b5bf8cf887..4ed767c0fcf 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,7 +4,7 @@ import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/arrow.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 a8b5264ff9c..0daf452629e 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,7 +9,7 @@ import 'package:devtools_app/src/shared/console/eval/inspector_tree.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 a8e0cd0d86a..e76ef5535bb 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,7 +7,7 @@ import 'package:devtools_app/src/screens/inspector/layout_explorer/ui/theme.dart 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:material_ui/material_ui.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.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 c2b1f449af6..9f77639cb46 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,7 +4,7 @@ import 'package:devtools_app/src/shared/diagnostics/diagnostics_node.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 88963611a34..2342129b3c6 100644 --- a/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart +++ b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart @@ -4,7 +4,7 @@ import 'package:devtools_app/devtools_app.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; 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 7a935146b00..b8fed9a71ad 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,7 +8,7 @@ import 'package:devtools_app/src/shared/diagnostics/primitives/source_location.d 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:flutter_test/flutter_test.dart' hide Fake; import 'package:mockito/mockito.dart'; 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 ab38883724f..dda2e3eded9 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,7 +12,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 26eb88b9c6c..481d4a25dea 100644 --- a/packages/devtools_app/test/screens/logging/logging_screen_test.dart +++ b/packages/devtools_app/test/screens/logging/logging_screen_test.dart @@ -16,7 +16,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/screens/logging/metadata_test.dart b/packages/devtools_app/test/screens/logging/metadata_test.dart index 7844d0a40d4..f81be420c53 100644 --- a/packages/devtools_app/test/screens/logging/metadata_test.dart +++ b/packages/devtools_app/test/screens/logging/metadata_test.dart @@ -7,7 +7,7 @@ import 'package:devtools_app/src/screens/logging/metadata.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logging/logging.dart'; import 'package:vm_service/vm_service.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 620180e67fd..f7a22ee626e 100644 --- a/packages/devtools_app/test/screens/memory/chart/chart_test.dart +++ b/packages/devtools_app/test/screens/memory/chart/chart_test.dart @@ -13,7 +13,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../test_infra/matchers/matchers.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 c287d9f260d..e1fa0b244ec 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,7 +7,7 @@ import 'package:devtools_app/src/shared/globals.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../test_infra/matchers/matchers.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 8531dde587a..4a37f9b016e 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 @@ -9,7 +9,7 @@ import 'package:devtools_app/src/screens/memory/panes/diff/controller/diff_pane_ show Json; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 72d18a519d3..e9602041ec4 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,7 +7,7 @@ import 'package:devtools_app/src/screens/memory/panes/diff/diff_pane.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../../test_infra/matchers/matchers.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 ce1153778ff..ab083fe983e 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,7 +7,7 @@ import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../../test_infra/matchers/matchers.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 01e83020ef7..d32db41d868 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,7 +10,7 @@ import 'package:devtools_app/src/screens/memory/shared/heap/class_filter.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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 79befb2bf5c..7aef930fd90 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,7 +15,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 72c0f19453d..374ff4037b1 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,7 +14,7 @@ import 'package:devtools_app/src/shared/table/table.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 d7e8d8e79ac..d4390605681 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,7 +13,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 d9556509895..99e3b4de4b8 100644 --- a/packages/devtools_app/test/screens/network/network_profiler_test.dart +++ b/packages/devtools_app/test/screens/network/network_profiler_test.dart @@ -14,7 +14,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:vm_service/vm_service.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 469ec8e55d1..58959704afc 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,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:vm_service/vm_service.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 1879f9c47f1..16b964f9967 100644 --- a/packages/devtools_app/test/screens/network/network_screen_test.dart +++ b/packages/devtools_app/test/screens/network/network_screen_test.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 e81e0c9e198..6775b7151a4 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,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 b31e0153a67..20b2c8a7777 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 10679f09c74..0f9cf91db4d 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,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 085b5ca41b8..4318218dd1f 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../../../test_infra/matchers/matchers.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 b8a3a404db7..52576894126 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 6f23218ee51..7c994c6a4fb 100644 --- a/packages/devtools_app/test/screens/performance/performance_screen_test.dart +++ b/packages/devtools_app/test/screens/performance/performance_screen_test.dart @@ -18,7 +18,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 559e0b17a10..bc97f47cfed 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,7 +14,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 81734b09128..398ce2f4a4e 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 429f0400320..374d8bbb384 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 7fdf14aa9ed..c7f6da272a0 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,7 +12,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f2fe081c20e..d00031bc965 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 200f79aa822..bbca5bbb935 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 b0782e9e70c..9410bcfa307 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 6bec829909f..de97317004e 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 21cc476035d..04726e2db42 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 01f73eeefdc..a24c2d4d104 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f23afd86da5..252d60cdd6c 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 0ce285eca09..233da65e50e 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f024b87f538..1c6d70dc1a0 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,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 19c8a3347dd..c01e62015f4 100644 --- a/packages/devtools_app/test/service/connection_info_test.dart +++ b/packages/devtools_app/test/service/connection_info_test.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 109ca9a1608..801a29b23d4 100644 --- a/packages/devtools_app/test/service/service_extension_widgets_test.dart +++ b/packages/devtools_app/test/service/service_extension_widgets_test.dart @@ -17,7 +17,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 255738eec7c..92653e2c32f 100644 --- a/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart +++ b/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart @@ -9,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 f8f4110097d..704e2480b07 100644 --- a/packages/devtools_app/test/shared/ansi_output_test.dart +++ b/packages/devtools_app/test/shared/ansi_output_test.dart @@ -11,7 +11,7 @@ import 'package:devtools_app/src/shared/primitives/ansi_utils.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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 228484c0c39..7c427fd1176 100644 --- a/packages/devtools_app/test/shared/charts/flame_chart_test.dart +++ b/packages/devtools_app/test/shared/charts/flame_chart_test.dart @@ -12,7 +12,7 @@ import 'package:devtools_app/src/shared/ui/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/devtools_app/test/shared/charts/treemap_test.dart b/packages/devtools_app/test/shared/charts/treemap_test.dart index 65805f87548..fd279f640bf 100644 --- a/packages/devtools_app/test/shared/charts/treemap_test.dart +++ b/packages/devtools_app/test/shared/charts/treemap_test.dart @@ -11,7 +11,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:vm_snapshot_analysis/treemap.dart'; diff --git a/packages/devtools_app/test/shared/framework/routing_test.dart b/packages/devtools_app/test/shared/framework/routing_test.dart index 5e74c370d09..3fb5bfffbf0 100644 --- a/packages/devtools_app/test/shared/framework/routing_test.dart +++ b/packages/devtools_app/test/shared/framework/routing_test.dart @@ -9,7 +9,7 @@ import 'package:devtools_app/devtools_app.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; class TestController extends DisposableController with RouteStateHandlerMixin { diff --git a/packages/devtools_app/test/shared/framework/screens_test.dart b/packages/devtools_app/test/shared/framework/screens_test.dart index 14bf1d36f9e..aefc3511545 100644 --- a/packages/devtools_app/test/shared/framework/screens_test.dart +++ b/packages/devtools_app/test/shared/framework/screens_test.dart @@ -10,7 +10,7 @@ import 'package:devtools_app/src/shared/primitives/query_parameters.dart'; 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:flutter_test/flutter_test.dart'; void main() { 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 dedf7e206cb..21fa52880ac 100644 --- a/packages/devtools_app/test/shared/managers/banner_messages_test.dart +++ b/packages/devtools_app/test/shared/managers/banner_messages_test.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 2ec8be6348a..578ac6662a6 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,7 +5,7 @@ import 'dart:async'; import 'package:devtools_app/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; // This file was originally forked from package:flutter_widgets. Note that the diff --git a/packages/devtools_app/test/shared/primitives/utils_test.dart b/packages/devtools_app/test/shared/primitives/utils_test.dart index f71c0cae441..601c765e082 100644 --- a/packages/devtools_app/test/shared/primitives/utils_test.dart +++ b/packages/devtools_app/test/shared/primitives/utils_test.dart @@ -5,7 +5,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/devtools_app/test/shared/table/table_test.dart b/packages/devtools_app/test/shared/table/table_test.dart index f977bb60302..c8c4f2cb208 100644 --- a/packages/devtools_app/test/shared/table/table_test.dart +++ b/packages/devtools_app/test/shared/table/table_test.dart @@ -11,7 +11,7 @@ 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' hide TableRow, Table; +import 'package:material_ui/material_ui.dart' hide TableRow, Table; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; 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 47d70a132f2..e0d6127b8c9 100644 --- a/packages/devtools_app/test/shared/ui/auto_complete_test.dart +++ b/packages/devtools_app/test/shared/ui/auto_complete_test.dart @@ -5,7 +5,7 @@ // ignore_for_file: avoid_print import 'package:devtools_app/src/shared/ui/search.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; // Set debug to true displays editing parts. 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 c882092ce79..2dd3d93cd55 100644 --- a/packages/devtools_app/test/shared/ui/common_widgets_test.dart +++ b/packages/devtools_app/test/shared/ui/common_widgets_test.dart @@ -7,7 +7,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 64d7e0bb556..7a6e3894fb6 100644 --- a/packages/devtools_app/test/shared/ui/editable_list_test.dart +++ b/packages/devtools_app/test/shared/ui/editable_list_test.dart @@ -7,7 +7,7 @@ import 'package:devtools_app/src/shared/ui/editable_list.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 4a5d968cd2a..9bbed86c3ee 100644 --- a/packages/devtools_app/test/shared/ui/hover_positioning_test.dart +++ b/packages/devtools_app/test/shared/ui/hover_positioning_test.dart @@ -5,7 +5,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; const _windowWidth = 800.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 00b172d8b37..2190d631bd8 100644 --- a/packages/devtools_app/test/shared/ui/search_highlighter_test.dart +++ b/packages/devtools_app/test/shared/ui/search_highlighter_test.dart @@ -5,7 +5,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/devtools_app/test/shared/ui/search_test.dart b/packages/devtools_app/test/shared/ui/search_test.dart index e98e83e67b0..60e8def7521 100644 --- a/packages/devtools_app/test/shared/ui/search_test.dart +++ b/packages/devtools_app/test/shared/ui/search_test.dart @@ -5,7 +5,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 8d003a08080..db1d96a0105 100644 --- a/packages/devtools_app/test/shared/ui/side_panel_test.dart +++ b/packages/devtools_app/test/shared/ui/side_panel_test.dart @@ -5,7 +5,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// The smallest contrast ratio WCAG 2.1 accepts for body text at level AA. 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 16982a068e1..0e16df0a75f 100644 --- a/packages/devtools_app/test/shared/ui/ui_utils_test.dart +++ b/packages/devtools_app/test/shared/ui/ui_utils_test.dart @@ -8,7 +8,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 65ad73d806d..2cb5a282f5a 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,7 +11,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 1145e402241..51a4ce2210f 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,7 +17,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; 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 eec1e4c5843..dcc2b8d0c15 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,7 +4,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 a6aa78574b2..72bb359ce37 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,7 +9,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 2eb7207e809..a9a45cd96d8 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,7 +13,7 @@ import 'package:devtools_shared/devtools_extensions.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.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 4084be21830..02ec8a7933c 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,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:flutter/widgets.dart'; class CustomApp extends StatelessWidget { 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 ffe19a4c0cf..4b1087757a1 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 @@ environment: dependencies: flutter: sdk: flutter + material_ui: any 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 cd774680642..a1b1a85e09b 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 1cd9568ab20..6eee6929fb4 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 98e13e7fa06..2f6f5b73943 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 @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 0ca44301163..da90771fa5a 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 04110b1e5c5..f84eb7ac2af 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 b123fbec2fc..f9ab525a571 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 @@ -20,6 +20,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 8387b9d658d..356c799db4c 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 09cd1f1f13c..b0e7f604d00 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 bdc06f5d827..c38f7b5b21d 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 @@ -16,6 +16,7 @@ dependencies: custom_widgets: path: ../custom_widgets + material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 34c6757c12b..a74e7cddfab 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 c4c76cf6070..fbff2649f4b 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 @@ -14,6 +14,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 a4ff98df8f3..a014a6f70de 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/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: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 c459ecb6047..a5a4b4424d2 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 1827a0fb6fe..805fba430b6 100644 --- a/packages/devtools_app/test/test_infra/scenes/memory/default.dart +++ b/packages/devtools_app/test/test_infra/scenes/memory/default.dart @@ -12,7 +12,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; import 'package:stager/stager.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 ce34c5f5238..24dcda191ad 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,7 +10,7 @@ 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:stager/stager.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 aec9c04b805..40db77dbb84 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/ui.dart'; 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 7e648578457..822128bd9bc 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,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:flutter_test/flutter_test.dart'; import 'package:stager/stager.dart'; 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 bdf95127c43..2e0bb46ccb0 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/src/standalone_ui/standalone_screen.dart'; 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 d13c09055af..f058e3a3b66 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/devtools_app.dart'; 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 7f679252897..6fffa6948c8 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/src/standalone_ui/standalone_screen.dart'; 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 7a089a811b1..28b3a1fe676 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 8a8e75e8064..b02829a95e1 100644 --- a/packages/devtools_app/test/test_infra/utils/debugger_utils.dart +++ b/packages/devtools_app/test/test_infra/utils/debugger_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 'package:flutter_test/flutter_test.dart'; Finder findDebuggerButtonWithIcon(IconData icon) => find.ancestor( From 4c828c7768d0f03035a4de2d02fdef52f36b4ef5 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 22 Sep 2026 11:52:56 -0700 Subject: [PATCH 02/18] Update pubspec.lock --- pubspec.lock | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index c2fa2b744ff..b2119c22ff1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -193,6 +193,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.7" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "1fa3c6bf0925e96c7235ab4f1a6c701cc07e3c7abe13aa4e3d1219e651586615" + url: "https://pub.dev" + source: hosted + version: "0.0.1" dap: dependency: transitive description: @@ -510,14 +518,6 @@ packages: 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 +550,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: transitive + description: + name: material_ui + sha256: "47b4acbb50683230000996cedd2a5ea511c2106c818db8ee28155ba0f0e26063" + url: "https://pub.dev" + source: hosted + version: "0.0.1" meta: dependency: transitive description: From cd191d697f7ddf97137bc9470e7dba39d76a79d3 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Tue, 22 Sep 2026 13:40:00 -0700 Subject: [PATCH 03/18] Specify material_ui and cupertino_ui package versions --- packages/devtools_app/pubspec.yaml | 6 +- pubspec.lock | 229 ++++++++++++++--------------- 2 files changed, 116 insertions(+), 119 deletions(-) diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index f341f056962..fb310305ee5 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: 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 meta: ^1.9.1 @@ -59,8 +59,8 @@ dependencies: vm_snapshot_analysis: ^0.7.6 web: ^1.0.0 - material_ui: any - cupertino_ui: any + cupertino_ui: ^1.1.1 + material_ui: ^1.4.0 dev_dependencies: args: ^2.4.2 benchmark_harness: ^2.3.1 diff --git a/pubspec.lock b/pubspec.lock index b2119c22ff1..464d1846a8a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,26 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d + sha256: fdcd9f70f9eb80df3bc5ed0fa67280df2595fd481948df8a9ab082e6a40ad04b url: "https://pub.dev" source: hosted - version: "91.0.0" + version: "108.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08 + sha256: a51c769bff3b6dfbe9d60199b8606d808290702a296bef0c26a4ca391d414e46 url: "https://pub.dev" source: hosted - version: "8.4.1" + version: "14.4.0" archive: dependency: transitive description: name: archive - sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff + sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4" url: "https://pub.dev" source: hosted - version: "4.0.9" + version: "4.3.0" args: dependency: transitive description: @@ -61,34 +61,34 @@ packages: dependency: transitive description: name: build - sha256: "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae" + sha256: "8a5c5761af8e31748bba3c82f68925ace40f3225c3eea25be9beb57eca7cd7a8" url: "https://pub.dev" source: hosted - version: "4.0.7" + version: "4.0.11" build_config: dependency: transitive description: name: build_config - sha256: "94eaf6708fe64408c632ef2689ca3777b112f9421306ccf4f8c84d7c5c9f83f8" + sha256: d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.3" build_daemon: dependency: transitive description: name: build_daemon - sha256: "8c0535c3b2f625619f4dd1036ef1127f2e77bfedf89ed2eb2676ef076e0b6712" + sha256: e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33 url: "https://pub.dev" source: hosted - version: "4.1.3" + version: "4.1.6" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16" + sha256: "894c243f6bc32015fec466ce30a6925bd537a77a426ee5bf481120477eb3de67" url: "https://pub.dev" source: hosted - version: "2.15.1" + version: "2.16.1" built_collection: dependency: transitive description: @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: built_value - sha256: "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56" + sha256: f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7 url: "https://pub.dev" source: hosted - version: "8.12.6" + version: "8.13.0" characters: dependency: transitive description: @@ -141,18 +141,18 @@ packages: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" code_builder: dependency: transitive description: name: code_builder - sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d" + sha256: aa5932e94c6c39c2f9ec4e5e06dfdd11a9430a61f6c41b6ba75b28ce0c481baf url: "https://pub.dev" source: hosted - version: "4.11.1" + version: "4.12.0" collection: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: cross_file - sha256: "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51" + sha256: f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6 url: "https://pub.dev" source: hosted - version: "0.3.5+4" + version: "0.3.5+5" crypto: dependency: transitive description: @@ -197,10 +197,10 @@ packages: dependency: transitive description: name: cupertino_ui - sha256: "1fa3c6bf0925e96c7235ab4f1a6c701cc07e3c7abe13aa4e3d1219e651586615" + sha256: c23816577a1280cff409e989541767887011f8f1d8c1863a794ed308af46f2a9 url: "https://pub.dev" source: hosted - version: "0.0.1" + version: "1.1.1" dap: dependency: transitive description: @@ -221,10 +221,10 @@ packages: dependency: transitive description: name: dart_style - sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b + sha256: "82ade9fc4273f29ed673e33166944465225b4f7fc5d4aaef48605cc751c18fc1" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.13" dds_service_extensions: dependency: transitive description: @@ -285,34 +285,34 @@ packages: dependency: transitive description: name: file_selector_android - sha256: "1d45e9910f68c16eb0c74f0b10097ad81aed516ea28054c027137e8f7d75e840" + sha256: d670cd0ce77a2e785b18d8b4d0a8d6a222d6a813ec9b7ddf2790a1b4fb6fa92c url: "https://pub.dev" source: hosted - version: "0.5.2+9" + version: "0.5.2+11" file_selector_ios: dependency: transitive description: name: file_selector_ios - sha256: e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca + sha256: "97269e5307a0ab813b1fa2430bada0a96e0afb74848417f8676f64ba5de0051c" url: "https://pub.dev" source: hosted - version: "0.5.3+5" + version: "0.5.3+6" file_selector_linux: dependency: transitive description: name: file_selector_linux - sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0" + sha256: da76400e7872ce7637ffdce12749ec24169c25f6195c28372208e65a24bcd2ab url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.9.4+1" file_selector_macos: dependency: transitive description: name: file_selector_macos - sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a" + sha256: d57c62362766b5e7ae739448650b66c6aab7a68ba7ecc65e04018652645ae0f4 url: "https://pub.dev" source: hosted - version: "0.9.5" + version: "0.9.5+1" file_selector_platform_interface: dependency: transitive description: @@ -333,10 +333,10 @@ packages: dependency: transitive description: name: file_selector_windows - sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd" + sha256: fbefc5fb92c6d3cbe8d284a2cd971b593bb07d2cd6da8557b81a862250b4acec url: "https://pub.dev" source: hosted - version: "0.9.3+5" + version: "0.9.3+6" fixnum: dependency: transitive description: @@ -363,6 +363,11 @@ packages: 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: @@ -405,10 +410,10 @@ packages: dependency: transitive description: name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + sha256: "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" graphs: dependency: transitive description: @@ -445,10 +450,10 @@ packages: dependency: transitive description: name: image - sha256: "6300175e00616bbc832e2fc91bfa4d776af5402c81c7151bee6905bb08473c52" + sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89 url: "https://pub.dev" source: hosted - version: "4.9.1" + version: "4.10.1" integration_test: dependency: transitive description: flutter @@ -458,18 +463,18 @@ packages: 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: name: io - sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b + sha256: "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.1.0" json_annotation: dependency: transitive description: @@ -518,6 +523,14 @@ packages: 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: @@ -554,10 +567,10 @@ packages: dependency: transitive description: name: material_ui - sha256: "47b4acbb50683230000996cedd2a5ea511c2106c818db8ee28155ba0f0e26063" + sha256: "134ab2f0843545c4e661e4ba2753fe1bcf0753cb690d5a9ee4870638a40411e9" url: "https://pub.dev" source: hosted - version: "0.0.1" + version: "1.4.0" meta: dependency: transitive description: @@ -570,18 +583,18 @@ packages: dependency: transitive description: name: mime - sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" mockito: dependency: transitive description: name: mockito - sha256: eff30d002f0c8bf073b6f929df4483b543133fcafce056870163587b03f1d422 + sha256: "6c1970612452260366064d4df80fdb3eece1ec5e52610ae34a0e51f2f3d8e64f" url: "https://pub.dev" source: hosted - version: "5.6.4" + version: "5.8.1" nested: dependency: transitive description: @@ -602,10 +615,10 @@ packages: dependency: transitive description: name: package_config - sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc + sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "3.0.0" path: dependency: transitive description: @@ -621,22 +634,14 @@ packages: relative: true source: path version: "0.0.1" - petitparser: - dependency: transitive - description: - name: petitparser - sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675" - url: "https://pub.dev" - source: hosted - version: "7.0.2" platform: dependency: transitive description: name: platform - sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + sha256: a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec url: "https://pub.dev" source: hosted - version: "3.1.6" + version: "3.2.0" plugin_platform_interface: dependency: transitive description: @@ -649,10 +654,10 @@ packages: dependency: transitive description: name: pointer_interceptor - sha256: "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523" + sha256: "9ad8889f36a417649ad7578fdb6df967157208cb90f69facd043660424020710" url: "https://pub.dev" source: hosted - version: "0.10.1+2" + version: "0.10.1+3" pointer_interceptor_ios: dependency: transitive description: @@ -681,10 +686,10 @@ packages: dependency: transitive description: name: pool - sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" + sha256: "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c" url: "https://pub.dev" source: hosted - version: "1.5.2" + version: "1.5.3" posix: dependency: transitive description: @@ -697,10 +702,10 @@ packages: dependency: transitive description: name: process - sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744 + sha256: "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891" url: "https://pub.dev" source: hosted - version: "5.0.5" + version: "5.0.6" protobuf: dependency: transitive description: @@ -721,18 +726,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" + sha256: c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796 url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.6.0" shelf: dependency: transitive description: @@ -769,10 +774,10 @@ packages: dependency: transitive description: name: skills_lint - sha256: "5daeff89c8c9d812cfa811e119ae88a32bb81d28c73aa7e899155885b2e63a63" + sha256: "5638b7ea79b265f0b2029abec61013296590e545eb6ecdb474bee1b94c06af79" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.5.2" sky_engine: dependency: transitive description: flutter @@ -782,10 +787,10 @@ packages: dependency: transitive description: name: source_gen - sha256: a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5 + sha256: "11b6047da8e4eb6c643ccac3d0fda3f9c9e11651695f7da24a85ade8aff15a44" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "4.3.0" source_map_stack_trace: dependency: transitive description: @@ -798,10 +803,10 @@ packages: dependency: transitive description: name: source_maps - sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812" + sha256: "14c2945847669b44089bb1222f66873d7ff7103c58911917f2a63c5a62327898" url: "https://pub.dev" source: hosted - version: "0.10.13" + version: "0.10.14" source_span: dependency: transitive description: @@ -822,18 +827,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.12.2" stager: dependency: transitive description: name: stager - sha256: "2782efb6057d9c391d96ef0e9714a0a3e02d311e7dd376448e3a87e4e87ac8f1" + sha256: c3b8bf30a2b02152a1125bb6fedf0d6f52fb0b154bd97854cb3e9cc59be975ad url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" stream_channel: dependency: transitive description: @@ -846,10 +851,10 @@ packages: dependency: transitive description: name: stream_transform - sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 + sha256: a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -878,26 +883,26 @@ packages: dependency: transitive description: name: test - sha256: ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f + sha256: de5d145b0afff7921e5e788a880f52d7e5f3ae24068a202f6fd3b58e4ba26323 url: "https://pub.dev" source: hosted - version: "1.31.1" + version: "1.32.0" test_api: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" test_core: dependency: transitive description: name: test_core - sha256: d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5 + sha256: "80f3fb49087454e07e7e07c67578cfdd156c8c3a5227d8b3f47c7b2d019c2e93" url: "https://pub.dev" source: hosted - version: "0.6.18" + version: "0.6.20" typed_data: dependency: transitive description: @@ -926,34 +931,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32 + sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610" url: "https://pub.dev" source: hosted - version: "6.3.32" + version: "6.3.33" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0" + sha256: "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.4.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a + sha256: "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "3.2.3" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18" + sha256: "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201" url: "https://pub.dev" source: hosted - version: "3.2.5" + version: "3.2.6" url_launcher_platform_interface: dependency: transitive description: @@ -974,18 +979,18 @@ packages: dependency: transitive description: name: url_launcher_windows - sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f" + sha256: "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" vector_math: 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: @@ -1054,10 +1059,10 @@ packages: dependency: transitive description: name: webdriver - sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade" + sha256: "28b82ec894fed45dd71c23ba62d1af973ed97dd59a4f5790a4d38b0b13e5657e" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" webkit_inspection_protocol: dependency: transitive description: @@ -1066,22 +1071,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - xml: - dependency: transitive - description: - name: xml - sha256: "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4" - url: "https://pub.dev" - source: hosted - version: "7.0.1" yaml: dependency: transitive description: name: yaml - sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" yaml_edit: dependency: transitive description: @@ -1091,5 +1088,5 @@ packages: source: hosted version: "2.2.4" sdks: - dart: ">=3.12.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" From 137cd1117fd32045e8cb75875622ae0f1f007906 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 10:41:16 -0700 Subject: [PATCH 04/18] Update devtools_app_shared --- packages/devtools_app_shared/example/ui/common_example.dart | 2 +- packages/devtools_app_shared/example/ui/dialog_example.dart | 2 +- packages/devtools_app_shared/example/ui/split_example.dart | 2 +- .../devtools_app_shared/lib/src/service/service_extensions.dart | 2 +- packages/devtools_app_shared/lib/src/ui/buttons.dart | 2 +- packages/devtools_app_shared/lib/src/ui/common.dart | 2 +- packages/devtools_app_shared/lib/src/ui/dialogs.dart | 2 +- packages/devtools_app_shared/lib/src/ui/flex_split_column.dart | 2 +- packages/devtools_app_shared/lib/src/ui/icons.dart | 2 +- packages/devtools_app_shared/lib/src/ui/split_pane.dart | 2 +- packages/devtools_app_shared/lib/src/ui/text_field.dart | 2 +- packages/devtools_app_shared/lib/src/ui/theme/theme.dart | 2 +- packages/devtools_app_shared/lib/src/utils/utils.dart | 2 +- packages/devtools_app_shared/pubspec.yaml | 1 + packages/devtools_app_shared/test/test_utils.dart | 2 +- packages/devtools_app_shared/test/ui/common_test.dart | 2 +- .../devtools_app_shared/test/ui/flex_split_column_test.dart | 2 +- packages/devtools_app_shared/test/ui/split_pane_test.dart | 2 +- packages/devtools_app_shared/test/ui/theme_test.dart | 2 +- packages/devtools_app_shared/test/utils/utils_test.dart | 2 +- 20 files changed, 20 insertions(+), 19 deletions(-) diff --git a/packages/devtools_app_shared/example/ui/common_example.dart b/packages/devtools_app_shared/example/ui/common_example.dart index e047dc2f6e6..90935eaf4c7 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 3100916b0c5..3cffa0a0d4f 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 71ff8cd6752..01d5f43a005 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 608c7c8090d..cb0f8d98251 100644 --- a/packages/devtools_app_shared/lib/src/service/service_extensions.dart +++ b/packages/devtools_app_shared/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:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; diff --git a/packages/devtools_app_shared/lib/src/ui/buttons.dart b/packages/devtools_app_shared/lib/src/ui/buttons.dart index c726cacf093..7665669e7c1 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 f27a29c6571..322ebcb402c 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 8eb916294d9..bb20d792c2e 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 ee7cc76a3f8..08f5ea4c5af 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 46616415979..89be41ce137 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 d68a2e6fcbd..5f0fdc96995 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 918963a90f2..2ba1676175a 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 cc3f0806f4d..ab3a100e6bf 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 df6db6176cf..53f84f922c7 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:async'; 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 9f41284e3dd..274c0709930 100644 --- a/packages/devtools_app_shared/pubspec.yaml +++ b/packages/devtools_app_shared/pubspec.yaml @@ -27,6 +27,7 @@ dependencies: vm_service: '>=13.0.0 <16.0.0' web: ^1.0.0 + material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: diff --git a/packages/devtools_app_shared/test/test_utils.dart b/packages/devtools_app_shared/test/test_utils.dart index 5a36b4ee05d..464725d3640 100644 --- a/packages/devtools_app_shared/test/test_utils.dart +++ b/packages/devtools_app_shared/test/test_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 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/devtools_app_shared/test/ui/common_test.dart b/packages/devtools_app_shared/test/ui/common_test.dart index 21f96b99f3e..9d14f0c2b13 100644 --- a/packages/devtools_app_shared/test/ui/common_test.dart +++ b/packages/devtools_app_shared/test/ui/common_test.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 'package:flutter_test/flutter_test.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 44d48a1f8e8..5037ed5b612 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,7 +4,7 @@ import 'package:collection/collection.dart'; import 'package:devtools_app_shared/src/ui/flex_split_column.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { 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 20827528950..093d6c08678 100644 --- a/packages/devtools_app_shared/test/ui/split_pane_test.dart +++ b/packages/devtools_app_shared/test/ui/split_pane_test.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:flutter_test/flutter_test.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 c5ffa4d54bc..d06ca13e940 100644 --- a/packages/devtools_app_shared/test/ui/theme_test.dart +++ b/packages/devtools_app_shared/test/ui/theme_test.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 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/packages/devtools_app_shared/test/utils/utils_test.dart b/packages/devtools_app_shared/test/utils/utils_test.dart index f342052acf8..a088c974305 100644 --- a/packages/devtools_app_shared/test/utils/utils_test.dart +++ b/packages/devtools_app_shared/test/utils/utils_test.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/utils.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { From 4e695c5eb6c53f1211e9544b92b887edbb04f306 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 10:52:41 -0700 Subject: [PATCH 05/18] Pin package versions, update all packages --- packages/devtools_app/pubspec.yaml | 4 ++-- packages/devtools_app_shared/pubspec.yaml | 2 +- .../example/app_that_uses_foo/lib/main.dart | 2 +- .../example/app_that_uses_foo/pubspec.yaml | 1 + .../packages/dart_foo_devtools_extension/lib/main.dart | 2 +- .../packages/dart_foo_devtools_extension/pubspec.yaml | 1 + .../foo/packages/foo/lib/src/foo_widget.dart | 2 +- .../packages_with_extensions/foo/packages/foo/pubspec.yaml | 1 + .../foo/packages/foo_devtools_extension/lib/main.dart | 2 +- .../packages/foo_devtools_extension/lib/src/common/ui.dart | 2 +- .../lib/src/feature_examples/devtools_event_example.dart | 2 +- .../src/feature_examples/devtools_extension_api_example.dart | 2 +- .../lib/src/feature_examples/dtd_example.dart | 2 +- .../src/feature_examples/expression_evaluation_example.dart | 2 +- .../lib/src/feature_examples/service_extension_example.dart | 2 +- .../lib/src/foo_devtools_extension.dart | 2 +- .../foo/packages/foo_devtools_extension/pubspec.yaml | 1 + .../standalone_extension/lib/main.dart | 2 +- .../standalone_extension/pubspec.yaml | 1 + .../integration_test/test/simulated_environment_test.dart | 2 +- .../_simulated_devtools_environment.dart | 2 +- .../lib/src/template/devtools_extension.dart | 2 +- packages/devtools_extensions/pubspec.yaml | 1 + .../devtools_shared/lib/src/extensions/extension_model.dart | 2 +- packages/devtools_test/lib/src/helpers/actions.dart | 2 +- packages/devtools_test/lib/src/helpers/finders.dart | 2 +- packages/devtools_test/lib/src/helpers/wrappers.dart | 2 +- .../lib/src/integration_test/integration_test_utils.dart | 2 +- .../lib/src/mocks/generated_mocks_factories.dart | 2 +- packages/devtools_test/pubspec.yaml | 1 + 30 files changed, 31 insertions(+), 24 deletions(-) diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index fb310305ee5..a12291a762e 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -20,6 +20,7 @@ resolution: workspace 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: @@ -39,6 +40,7 @@ dependencies: 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 @@ -59,8 +61,6 @@ dependencies: vm_snapshot_analysis: ^0.7.6 web: ^1.0.0 - cupertino_ui: ^1.1.1 - material_ui: ^1.4.0 dev_dependencies: args: ^2.4.2 benchmark_harness: ^2.3.1 diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml index 274c0709930..786defea6ca 100644 --- a/packages/devtools_app_shared/pubspec.yaml +++ b/packages/devtools_app_shared/pubspec.yaml @@ -20,6 +20,7 @@ dependencies: 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 @@ -27,7 +28,6 @@ dependencies: vm_service: '>=13.0.0 <16.0.0' web: ^1.0.0 - material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 26fa27ccab6..ebc165b0bd7 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 cda6e2e2db5..a6876b4c4cc 100644 --- a/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml +++ b/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml @@ -19,6 +19,7 @@ dependencies: foo: path: ../packages_with_extensions/foo/packages/foo + material_ui: any dev_dependencies: flutter_test: sdk: flutter 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 1ba9de66162..6bc10f184fe 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 e5e84eb5926..959afb852a0 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 @@ -20,6 +20,7 @@ dependencies: flutter: sdk: flutter + material_ui: any 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 670e62a6c0f..be9542a52ac 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 d7a96fb4454..6e771e3e9ba 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 @@ -13,6 +13,7 @@ dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flutter_test: sdk: flutter 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 91f63ec1fd3..c41d4493521 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 73b58913930..52bdc761b29 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 41f14c21572..0a9041863c9 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 cc7cd067510..31936080136 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 114902214b0..34abddecc2e 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/service.dart'; 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 837d4dc34ea..4ad272c6e60 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/service.dart'; 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 f82d6774061..e14e03743f4 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 'dart:async'; 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 16f2eaa6501..852fbcd0cdf 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 f7e2141944e..eba94a103cb 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 @@ -21,6 +21,7 @@ dependencies: flutter: sdk: flutter + material_ui: any 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 c4f399a34ed..a59c303b023 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 c58a4a8639a..6a430969ea9 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 @@ -20,6 +20,7 @@ dependencies: flutter: sdk: flutter + material_ui: any 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 7c50f4b8d78..f377d73ff0f 100644 --- a/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart +++ b/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart @@ -6,7 +6,7 @@ import 'package:devtools_app_shared/ui.dart'; 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:material_ui/material_ui.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'; 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 f674c251a61..d0a8536e126 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,7 +9,7 @@ import 'dart:math' as math; 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:flutter/services.dart'; import 'package:web/web.dart' hide Text, Clipboard; diff --git a/packages/devtools_extensions/lib/src/template/devtools_extension.dart b/packages/devtools_extensions/lib/src/template/devtools_extension.dart index 5c9e43b61b9..99e8ae7f4b5 100644 --- a/packages/devtools_extensions/lib/src/template/devtools_extension.dart +++ b/packages/devtools_extensions/lib/src/template/devtools_extension.dart @@ -14,7 +14,7 @@ import 'package:devtools_app_shared/utils.dart'; 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:material_ui/material_ui.dart'; import 'package:logging/logging.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 4639c9cbcc4..66338ab4c25 100644 --- a/packages/devtools_extensions/pubspec.yaml +++ b/packages/devtools_extensions/pubspec.yaml @@ -25,6 +25,7 @@ dependencies: 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 4cb5b22998a..1f14661da0a 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 39ed034aa4c..e6fb6949fc4 100644 --- a/packages/devtools_test/lib/src/helpers/actions.dart +++ b/packages/devtools_test/lib/src/helpers/actions.dart @@ -6,7 +6,7 @@ import 'package:devtools_app/devtools_app.dart'; import 'package:devtools_app_shared/ui.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.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 1b22b61f0a6..5f596e1e2a5 100644 --- a/packages/devtools_test/lib/src/helpers/finders.dart +++ b/packages/devtools_test/lib/src/helpers/finders.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:flutter_test/flutter_test.dart'; Finder findSubstring(String text) { diff --git a/packages/devtools_test/lib/src/helpers/wrappers.dart b/packages/devtools_test/lib/src/helpers/wrappers.dart index a782b26d6dc..b0623e4008c 100644 --- a/packages/devtools_test/lib/src/helpers/wrappers.dart +++ b/packages/devtools_test/lib/src/helpers/wrappers.dart @@ -11,7 +11,7 @@ import 'package:devtools_app/devtools_app.dart'; 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:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:meta/meta.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 605df1e5e47..d1f45c29164 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,7 +8,7 @@ import 'dart:ui' as ui; 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:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.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 f16f27330c4..2da5cea47b3 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 'dart:async'; 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 6e5d0717b69..197368a5d50 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml @@ -27,6 +27,7 @@ dependencies: sdk: flutter integration_test: sdk: flutter + material_ui: ^1.4.0 meta: ^1.9.1 mockito: ^5.4.1 path: ^1.8.0 From 47a589b568fc26bfe2c78205e3a8f41ce05f8b5d Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 11:10:21 -0700 Subject: [PATCH 06/18] Pin material_ui to ^1.4.0 --- .../test/test_infra/fixtures/custom_widgets/pubspec.yaml | 2 +- .../test/test_infra/fixtures/flutter_app/pubspec.yaml | 2 +- .../test/test_infra/fixtures/flutter_error_app/pubspec.yaml | 2 +- .../test/test_infra/fixtures/inspector_app/pubspec.yaml | 2 +- .../test/test_infra/fixtures/memory_app/pubspec.yaml | 2 +- .../example/app_that_uses_foo/pubspec.yaml | 2 +- .../packages/dart_foo_devtools_extension/pubspec.yaml | 2 +- .../packages_with_extensions/foo/packages/foo/pubspec.yaml | 2 +- .../foo/packages/foo_devtools_extension/pubspec.yaml | 2 +- .../standalone_extension/pubspec.yaml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) 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 4b1087757a1..69050892da4 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,4 +8,4 @@ environment: dependencies: flutter: sdk: flutter - material_ui: any + material_ui: ^1.4.0 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 2f6f5b73943..3f1948bccbb 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 @@ -13,8 +13,8 @@ environment: dependencies: flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 f9ab525a571..363c237d030 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 @@ -19,8 +19,8 @@ environment: dependencies: flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 c38f7b5b21d..a2f5e806053 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 @@ -15,8 +15,8 @@ dependencies: sdk: flutter custom_widgets: path: ../custom_widgets + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 fbff2649f4b..2902a22e25a 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 @@ -13,8 +13,8 @@ environment: dependencies: flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_lints: ^6.0.0 flutter_test: 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 a6876b4c4cc..209fc49893d 100644 --- a/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml +++ b/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml @@ -18,8 +18,8 @@ dependencies: path: ../packages_with_extensions/dart_foo/packages/dart_foo foo: path: ../packages_with_extensions/foo/packages/foo + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_test: sdk: flutter 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 959afb852a0..eba41f926c7 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 @@ -19,8 +19,8 @@ dependencies: path: ../../../../../../devtools_extensions flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any flutter: uses-material-design: true 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 6e771e3e9ba..b23d888fe89 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,8 +12,8 @@ environment: dependencies: flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any dev_dependencies: flutter_test: sdk: flutter 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 eba94a103cb..86a69acbf08 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 @@ -20,8 +20,8 @@ dependencies: path: ^1.8.0 flutter: sdk: flutter + material_ui: ^1.4.0 - material_ui: any flutter: uses-material-design: true 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 6a430969ea9..24918d0a60d 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 @@ -19,8 +19,8 @@ dependencies: path: ../../../../devtools_extensions flutter: sdk: flutter - - material_ui: any + material_ui: ^1.4.0 + flutter: uses-material-design: true From 8e1f61c46aa5f5856a6b941303a16e66c5c3031f Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 11:30:12 -0700 Subject: [PATCH 07/18] Add cupertino_ui to devtools_test --- packages/devtools_test/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index 197368a5d50..c91dcf389b4 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml @@ -15,6 +15,7 @@ resolution: workspace dependencies: collection: ^1.15.0 + cupertino_ui: ^1.1.1 dap: ^1.1.0 devtools_app: devtools_app_shared: From b56611cd003f22c7043d61c1532aca1a280d9686 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 11:32:33 -0700 Subject: [PATCH 08/18] Remove cupertino_ui from devtools_test --- packages/devtools_test/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index c91dcf389b4..197368a5d50 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml @@ -15,7 +15,6 @@ resolution: workspace dependencies: collection: ^1.15.0 - cupertino_ui: ^1.1.1 dap: ^1.1.0 devtools_app: devtools_app_shared: From e28fbc90de817430ef405441537d909b9768f4e8 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 12:22:59 -0700 Subject: [PATCH 09/18] Add DCM ignore for Flutter SDK import in Flutter apps --- .../test/test_infra/fixtures/flutter_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/flutter_error_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/inspector_app/pubspec.yaml | 1 + .../test/test_infra/fixtures/memory_app/pubspec.yaml | 1 + .../devtools_extensions/example/app_that_uses_foo/pubspec.yaml | 1 + .../dart_foo/packages/dart_foo_devtools_extension/pubspec.yaml | 1 + .../foo/packages/foo_devtools_extension/pubspec.yaml | 1 + .../packages_with_extensions/standalone_extension/pubspec.yaml | 1 + 8 files changed, 8 insertions(+) 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 3f1948bccbb..3b331f49ac8 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,6 +11,7 @@ environment: flutter: '>=3.0.0' dependencies: + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter material_ui: ^1.4.0 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 363c237d030..ec2552088b0 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,6 +17,7 @@ environment: flutter: '>=3.0.0' dependencies: + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter material_ui: ^1.4.0 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 a2f5e806053..9c4e76dff4b 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,6 +11,7 @@ environment: flutter: '>=3.0.0' dependencies: + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter custom_widgets: 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 2902a22e25a..8d6a6f7965b 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,6 +11,7 @@ environment: flutter: '>=3.0.0' dependencies: + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter material_ui: ^1.4.0 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 209fc49893d..722e925db55 100644 --- a/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml +++ b/packages/devtools_extensions/example/app_that_uses_foo/pubspec.yaml @@ -12,6 +12,7 @@ environment: flutter: '>=3.0.0' dependencies: + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter dart_foo: 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 eba41f926c7..8e10c363796 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,6 +17,7 @@ dependencies: path: ../../../../../../devtools_app_shared devtools_extensions: path: ../../../../../../devtools_extensions + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter material_ui: ^1.4.0 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 86a69acbf08..4d74da219a2 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,6 +18,7 @@ dependencies: 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 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 24918d0a60d..bc3970283c4 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,6 +17,7 @@ dependencies: path: ../../../../devtools_app_shared devtools_extensions: path: ../../../../devtools_extensions + # ignore: dependencies, required for Flutter SDK. flutter: sdk: flutter material_ui: ^1.4.0 From cbb5ffa4fcc3fd0d83acc834f72f94a8a810cb61 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 12:36:07 -0700 Subject: [PATCH 10/18] Run dart fix --apply on devtools_test --- packages/devtools_test/lib/src/helpers/actions.dart | 2 +- packages/devtools_test/lib/src/helpers/finders.dart | 2 +- packages/devtools_test/lib/src/helpers/wrappers.dart | 2 +- .../lib/src/integration_test/integration_test_utils.dart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/devtools_test/lib/src/helpers/actions.dart b/packages/devtools_test/lib/src/helpers/actions.dart index e6fb6949fc4..6bcc527e644 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:material_ui/material_ui.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 5f596e1e2a5..440ae86aaff 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:material_ui/material_ui.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 b0623e4008c..0a70c24940c 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/devtools_app.dart'; 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:material_ui/material_ui.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 d1f45c29164..6cd60ebfff3 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 'dart:ui' as ui; import 'package:devtools_app/devtools_app.dart'; import 'package:devtools_app/main.dart' as app; import 'package:devtools_app_shared/ui.dart'; -import 'package:material_ui/material_ui.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'; From 72727b0ebb0b1d44458020746c13620d4e707921 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 12:41:30 -0700 Subject: [PATCH 11/18] Update widget_icons package to material_ui --- third_party/packages/widget_icons/example/lib/main.dart | 2 +- third_party/packages/widget_icons/example/pubspec.yaml | 1 + third_party/packages/widget_icons/lib/widget_icons.dart | 2 +- third_party/packages/widget_icons/lib/widget_theme.dart | 2 +- third_party/packages/widget_icons/pubspec.yaml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/third_party/packages/widget_icons/example/lib/main.dart b/third_party/packages/widget_icons/example/lib/main.dart index cc9c60e4f0c..3cc92dd24e0 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 64a33c7751e..b4a105c3b2b 100644 --- a/third_party/packages/widget_icons/example/pubspec.yaml +++ b/third_party/packages/widget_icons/example/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: widget_icons: path: ../ + material_ui: any 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 71cbfc8b505..d618ff2896c 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 6980e7321b0..f80f368b541 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 0d7d600da9c..6851a24f485 100644 --- a/third_party/packages/widget_icons/pubspec.yaml +++ b/third_party/packages/widget_icons/pubspec.yaml @@ -10,6 +10,7 @@ environment: dependencies: flutter: sdk: flutter + material_ui: ^1.4.0 dev_dependencies: flutter_test: From 9a4c69c432c728aa55a85f16690fe07fc585865c Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 12:41:48 -0700 Subject: [PATCH 12/18] Sort imports using dart fix --apply --- .../test_infra/automators/_cpu_profiler_automator.dart | 2 +- .../test_infra/automators/_performance_automator.dart | 2 +- .../benchmark/test_infra/automators/devtools_automator.dart | 2 +- .../test/live_connection/debugger_panel_test.dart | 2 +- .../test/live_connection/devtools_extensions_test.dart | 2 +- .../test/live_connection/memory_screen_helpers.dart | 2 +- .../performance_screen_event_recording_test.dart | 2 +- .../integration_test/test/offline/perfetto_test.dart | 2 +- packages/devtools_app/lib/initialization.dart | 2 +- .../devtools_app/lib/src/framework/notifications_view.dart | 2 +- packages/devtools_app/lib/src/framework/release_notes.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/codeview.dart | 2 +- .../lib/src/screens/debugger/debugger_screen.dart | 2 +- .../devtools_app/lib/src/screens/debugger/file_search.dart | 2 +- packages/devtools_app/lib/src/screens/debugger/key_sets.dart | 2 +- .../lib/src/screens/debugger/syntax_highlighter.dart | 2 +- .../lib/src/screens/inspector/inspector_controller.dart | 2 +- .../lib/src/screens/inspector/inspector_tree_controller.dart | 2 +- .../lib/src/screens/inspector/layout_explorer/flex/utils.dart | 2 +- .../inspector/layout_explorer/ui/layout_explorer_widget.dart | 2 +- packages/devtools_app/lib/src/screens/logging/metadata.dart | 2 +- .../src/screens/memory/panes/chart/widgets/chart_pane.dart | 2 +- .../lib/src/screens/memory/panes/diff/diff_pane.dart | 2 +- .../src/screens/memory/panes/diff/widgets/snapshot_list.dart | 2 +- .../lib/src/screens/memory/panes/tracing/tracing_tree.dart | 2 +- .../src/screens/network/network_request_inspector_views.dart | 2 +- .../panes/timeline_events/perfetto/_perfetto_web.dart | 2 +- .../lib/src/screens/performance/performance_screen.dart | 2 +- .../isolate_statistics/isolate_statistics_view.dart | 2 +- .../queued_microtasks/queued_microtasks_view.dart | 2 +- .../lib/src/service/service_extension_widgets.dart | 2 +- packages/devtools_app/lib/src/shared/charts/chart.dart | 2 +- packages/devtools_app/lib/src/shared/charts/flame_chart.dart | 2 +- .../shared/config_specific/drag_and_drop/drag_and_drop.dart | 2 +- .../lib/src/shared/console/widgets/display_provider.dart | 2 +- .../devtools_app/lib/src/shared/console/widgets/evaluate.dart | 2 +- packages/devtools_app/lib/src/shared/constants.dart | 2 +- .../lib/src/shared/diagnostics/diagnostics_node.dart | 2 +- .../lib/src/shared/diagnostics/inspector_service.dart | 2 +- packages/devtools_app/lib/src/shared/framework/routing.dart | 2 +- packages/devtools_app/lib/src/shared/framework/screen.dart | 2 +- .../primitives/flutter_widgets/linked_scroll_controller.dart | 2 +- packages/devtools_app/lib/src/shared/primitives/utils.dart | 2 +- packages/devtools_app/lib/src/shared/table/table.dart | 2 +- packages/devtools_app/lib/src/shared/ui/common_widgets.dart | 2 +- packages/devtools_app/lib/src/shared/ui/search.dart | 2 +- packages/devtools_app/lib/src/shared/ui/side_panel.dart | 2 +- packages/devtools_app/lib/src/shared/ui/utils.dart | 2 +- packages/devtools_app/lib/src/shared/utils/utils.dart | 2 +- .../ide_shared/property_editor/property_editor_inputs.dart | 2 +- .../devtools_app/test/extensions/extension_screen_test.dart | 2 +- .../devtools_app/test/extensions/extension_settings_test.dart | 2 +- packages/devtools_app/test/framework/home_screen_test.dart | 2 +- packages/devtools_app/test/framework/initializer_test.dart | 2 +- packages/devtools_app/test/framework/notifications_test.dart | 2 +- .../test/framework/observer/disconnect_observer_test.dart | 2 +- .../test/framework/scaffold/scaffold_debugger_test.dart | 2 +- .../framework/scaffold/scaffold_debugging_controls_test.dart | 2 +- .../test/framework/scaffold/scaffold_no_app_test.dart | 2 +- .../test/framework/scaffold/scaffold_profile_test.dart | 2 +- .../devtools_app/test/framework/scaffold/scaffold_test.dart | 2 +- .../test/screens/accessibility/accessibility_screen_test.dart | 2 +- .../test/screens/app_size/app_size_screen_test.dart | 2 +- .../test/screens/app_size/code_size_attribution_test.dart | 2 +- .../test/screens/cpu_profiler/cpu_profiler_test.dart | 2 +- .../screens/cpu_profiler/method_table/method_table_test.dart | 2 +- .../test/screens/cpu_profiler/profiler_screen_test.dart | 2 +- .../screens/debugger/debugger_codeview_statistics_test.dart | 2 +- .../test/screens/debugger/debugger_codeview_test.dart | 2 +- .../test/screens/debugger/debugger_console_test.dart | 2 +- .../screens/debugger/debugger_controls_overflow_test.dart | 2 +- .../test/screens/debugger/debugger_floating_test.dart | 2 +- .../screens/debugger/debugger_screen_breakpoints_test.dart | 2 +- .../screens/debugger/debugger_screen_call_stack_test.dart | 2 +- .../screens/debugger/debugger_screen_dap_variables_test.dart | 2 +- .../debugger/debugger_screen_explorer_visibility_test.dart | 2 +- .../test/screens/debugger/debugger_screen_paused_test.dart | 2 +- .../test/screens/debugger/debugger_screen_test.dart | 2 +- .../test/screens/debugger/debugger_screen_variables_test.dart | 2 +- .../test/screens/debugger/debugger_scripts_test.dart | 2 +- .../devtools_app/test/screens/debugger/eval_field_test.dart | 2 +- .../devtools_app/test/screens/debugger/file_search_test.dart | 2 +- .../test/screens/debugger/program_explorer_test.dart | 2 +- .../test/screens/debugger/syntax_highlighter_test.dart | 4 ++-- .../screens/deep_link_validation/deep_links_screen_test.dart | 2 +- .../deep_link_validation/select_project_view_test.dart | 2 +- .../devtools_app/test/screens/dtd/dtd_tools_screen_test.dart | 2 +- packages/devtools_app/test/screens/dtd/events_test.dart | 2 +- packages/devtools_app/test/screens/dtd/services_test.dart | 2 +- .../devtools_app/test/screens/inspector/diagnostics_test.dart | 2 +- .../screens/inspector/inspector_error_navigator_test.dart | 3 +-- .../test/screens/inspector/inspector_integration_test.dart | 2 +- .../test/screens/inspector/inspector_screen_test.dart | 2 +- .../test/screens/inspector/inspector_tree_test.dart | 2 +- .../screens/inspector/layout_explorer/flex/arrow_test.dart | 2 +- .../screens/inspector/layout_explorer/flex/flex_test.dart | 2 +- .../inspector/layout_explorer/inspector_data_models_test.dart | 2 +- .../inspector/layout_explorer/layout_explorer_test_utils.dart | 2 +- .../test/screens/inspector/utils/inspector_tree.dart | 2 +- .../inspector/widget_creation_location_trailing_test.dart | 2 +- .../test/screens/logging/logging_screen_data_test.dart | 2 +- .../test/screens/logging/logging_screen_test.dart | 2 +- packages/devtools_app/test/screens/logging/metadata_test.dart | 2 +- .../devtools_app/test/screens/memory/chart/chart_test.dart | 2 +- .../test/screens/memory/control/settings_dialog_test.dart | 2 +- .../memory/diff/controller/diff_pane_controller_test.dart | 4 ++-- .../test/screens/memory/diff/widgets/class_filter_test.dart | 2 +- .../test/screens/memory/diff/widgets/diff_pane_test.dart | 2 +- .../test/screens/memory/framework/memory_controller_test.dart | 2 +- .../test/screens/memory/framework/memory_screen_test.dart | 2 +- .../memory/profile/allocation_profile_table_view_test.dart | 2 +- .../test/screens/memory/tracing/tracing_view_test.dart | 2 +- .../test/screens/network/network_profiler_test.dart | 2 +- .../test/screens/network/network_request_inspector_test.dart | 2 +- .../test/screens/network/network_screen_test.dart | 2 +- .../screens/performance/controls/enhance_tracing_test.dart | 2 +- .../performance/controls/performance_controls_test.dart | 2 +- .../performance/flutter_frames/flutter_frames_chart_test.dart | 2 +- .../performance/frame_analysis/frame_analysis_test.dart | 2 +- .../screens/performance/frame_analysis/frame_hints_test.dart | 2 +- .../test/screens/performance/performance_screen_test.dart | 2 +- .../screens/performance/tabbed_performance_view_test.dart | 2 +- .../object_inspector/object_inspector_view_test.dart | 2 +- .../vm_developer/object_inspector/vm_class_display_test.dart | 2 +- .../vm_developer/object_inspector/vm_code_display_test.dart | 2 +- .../object_inspector/vm_developer_common_widgets_test.dart | 2 +- .../vm_developer/object_inspector/vm_field_display_test.dart | 2 +- .../object_inspector/vm_function_display_test.dart | 2 +- .../object_inspector/vm_ic_data_display_test.dart | 2 +- .../object_inspector/vm_library_display_test.dart | 2 +- .../object_inspector/vm_object_pool_display_test.dart | 2 +- .../vm_developer/object_inspector/vm_script_display_test.dart | 2 +- .../object_inspector/vm_simple_list_display_test.dart | 2 +- .../queued_microtasks/queued_microtasks_view_test.dart | 2 +- packages/devtools_app/test/service/connection_info_test.dart | 2 +- .../test/service/service_extension_widgets_test.dart | 2 +- .../test/shared/analytics/analytics_prompt_test.dart | 2 +- packages/devtools_app/test/shared/ansi_output_test.dart | 2 +- .../devtools_app/test/shared/charts/flame_chart_test.dart | 2 +- packages/devtools_app/test/shared/charts/treemap_test.dart | 2 +- packages/devtools_app/test/shared/framework/routing_test.dart | 2 +- packages/devtools_app/test/shared/framework/screens_test.dart | 2 +- .../test/shared/managers/banner_messages_test.dart | 2 +- .../test/shared/primitives/linked_scroll_controller_test.dart | 2 +- packages/devtools_app/test/shared/primitives/utils_test.dart | 2 +- packages/devtools_app/test/shared/table/table_test.dart | 2 +- packages/devtools_app/test/shared/ui/auto_complete_test.dart | 2 +- packages/devtools_app/test/shared/ui/common_widgets_test.dart | 2 +- packages/devtools_app/test/shared/ui/editable_list_test.dart | 2 +- .../devtools_app/test/shared/ui/hover_positioning_test.dart | 2 +- .../devtools_app/test/shared/ui/search_highlighter_test.dart | 2 +- packages/devtools_app/test/shared/ui/search_test.dart | 2 +- packages/devtools_app/test/shared/ui/side_panel_test.dart | 2 +- packages/devtools_app/test/shared/ui/ui_utils_test.dart | 2 +- .../devtools_app/test/shared/ui/vm_flag_widgets_test.dart | 2 +- .../ide_shared/property_editor/property_editor_test.dart | 2 +- .../standalone_ui/ide_shared/property_editor/utils_test.dart | 2 +- .../test/standalone_ui/vs_code/debug_sessions_test.dart | 2 +- .../test/standalone_ui/vs_code/devtools_test.dart | 2 +- .../test_infra/fixtures/custom_widgets/lib/src/widgets.dart | 2 +- .../devtools_app/test/test_infra/scenes/memory/default.dart | 2 +- .../test/test_infra/scenes/memory/diff_snapshot.dart | 2 +- .../test/test_infra/scenes/scene_test_extensions.dart | 2 +- .../devtools_app/test/test_infra/utils/debugger_utils.dart | 2 +- .../lib/src/service/service_extensions.dart | 2 +- packages/devtools_app_shared/test/test_utils.dart | 2 +- packages/devtools_app_shared/test/ui/common_test.dart | 2 +- .../devtools_app_shared/test/ui/flex_split_column_test.dart | 2 +- packages/devtools_app_shared/test/ui/split_pane_test.dart | 2 +- packages/devtools_app_shared/test/ui/theme_test.dart | 2 +- packages/devtools_app_shared/test/utils/utils_test.dart | 2 +- .../integration_test/test/simulated_environment_test.dart | 2 +- .../_simulated_devtools_environment.dart | 2 +- .../lib/src/template/devtools_extension.dart | 2 +- 174 files changed, 176 insertions(+), 177 deletions(-) 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 48f79da8e02..64d26fc03fd 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/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:material_ui/material_ui.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 0615831f3c8..d334c15d836 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:material_ui/material_ui.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 445603502bf..cb9133be2c7 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_app/devtools_app.dart'; import 'package:devtools_test/helpers.dart'; import 'package:devtools_test/test_data.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/integration_test/test/live_connection/debugger_panel_test.dart b/packages/devtools_app/integration_test/test/live_connection/debugger_panel_test.dart index fef87631779..7f6a7a5676d 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/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:material_ui/material_ui.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 8bca95a9167..7003f0517f1 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_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:material_ui/material_ui.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 a22a073a8a3..8699bf30429 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/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:material_ui/material_ui.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 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 aa623450ba7..f311f4348c7 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/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:material_ui/material_ui.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 f67ec1101c4..185b266bbe8 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_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:material_ui/material_ui.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 a64063f46f2..d721615d872 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:material_ui/material_ui.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/framework/notifications_view.dart b/packages/devtools_app/lib/src/framework/notifications_view.dart index 825e6b758d6..23e8a1439e8 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/release_notes.dart b/packages/devtools_app/lib/src/framework/release_notes.dart index 40075655f50..a4d6a8d9688 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 '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:material_ui/material_ui.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/screens/debugger/codeview.dart b/packages/devtools_app/lib/src/screens/debugger/codeview.dart index 40484e84455..53c83c85293 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 '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:material_ui/material_ui.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/debugger_screen.dart b/packages/devtools_app/lib/src/screens/debugger/debugger_screen.dart index 18ad76ebe64..7972a8eccd8 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/shared.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 da9e5024d0c..dd944a1a9ad 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:material_ui/material_ui.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 83f6a44735c..d77a4a7949f 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:material_ui/material_ui.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/syntax_highlighter.dart b/packages/devtools_app/lib/src/screens/debugger/syntax_highlighter.dart index f64b3ca2120..c76af32971d 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:material_ui/material_ui.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/inspector/inspector_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_controller.dart index b39569fcc6a..a5a67830f80 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 'dart:async'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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_tree_controller.dart b/packages/devtools_app/lib/src/screens/inspector/inspector_tree_controller.dart index d1b858dfadf..f8d785a6148 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/flex/utils.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/flex/utils.dart index e4a19deed8d..a6dcd6e0d07 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:material_ui/material_ui.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/layout_explorer_widget.dart b/packages/devtools_app/lib/src/screens/inspector/layout_explorer/ui/layout_explorer_widget.dart index 55f7f0fc24c..d1392f2c7d8 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:material_ui/material_ui.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/logging/metadata.dart b/packages/devtools_app/lib/src/screens/logging/metadata.dart index 30ef7b64581..7e07b94d0ae 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 'dart:convert'; import 'package:devtools_app_shared/service.dart'; import 'package:devtools_app_shared/ui.dart'; -import 'package:material_ui/material_ui.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/panes/chart/widgets/chart_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/chart/widgets/chart_pane.dart index 92886568185..41b9e1fe30d 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:material_ui/material_ui.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/diff/diff_pane.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/diff_pane.dart index df79c5a31e5..cf946cb3a41 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/snapshot_list.dart b/packages/devtools_app/lib/src/screens/memory/panes/diff/widgets/snapshot_list.dart index 4317233c5fc..524e495b415 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/tracing/tracing_tree.dart b/packages/devtools_app/lib/src/screens/memory/panes/tracing/tracing_tree.dart index a1bc4958c93..6e6029f4d7f 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:material_ui/material_ui.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/network/network_request_inspector_views.dart b/packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart index 87698f22eef..46d35a92151 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 'dart:convert'; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/performance/panes/timeline_events/perfetto/_perfetto_web.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/perfetto/_perfetto_web.dart index 4f36b7068cb..39db92831f9 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 'dart:typed_data'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_app_shared/web_utils.dart'; import 'package:devtools_shared/devtools_shared.dart'; -import 'package:material_ui/material_ui.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/performance_screen.dart b/packages/devtools_app/lib/src/screens/performance/performance_screen.dart index ee8202fba7a..f78ab1d9140 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/vm_developer/isolate_statistics/isolate_statistics_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/isolate_statistics/isolate_statistics_view.dart index 094d528a6a9..dd59a5f657d 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:material_ui/material_ui.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/queued_microtasks/queued_microtasks_view.dart b/packages/devtools_app/lib/src/screens/vm_developer/queued_microtasks/queued_microtasks_view.dart index a75d25d4257..516b3492139 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:material_ui/material_ui.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/service/service_extension_widgets.dart b/packages/devtools_app/lib/src/service/service_extension_widgets.dart index e24cfe740bc..07d8fd3086f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:material_ui/material_ui.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/shared/charts/chart.dart b/packages/devtools_app/lib/src/shared/charts/chart.dart index 9bab7a0273f..652675f6fcf 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 'dart:ui'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/flame_chart.dart b/packages/devtools_app/lib/src/shared/charts/flame_chart.dart index 008f2b18ae7..a3210fba4fe 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:material_ui/material_ui.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/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 54a69e31e06..b195a21bcb6 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:material_ui/material_ui.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/widgets/display_provider.dart b/packages/devtools_app/lib/src/shared/console/widgets/display_provider.dart index 24d4df082e4..b8d398b27d6 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 d223688ffa5..44e4a7e71f6 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/constants.dart b/packages/devtools_app/lib/src/shared/constants.dart index 0a999b2b545..03679c29cfd 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:material_ui/material_ui.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 c66b0b5c188..1942742d599 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 'dart:async'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 ad930c7da4f..23d4d028cbc 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:async'; 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:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:vm_service/vm_service.dart'; diff --git a/packages/devtools_app/lib/src/shared/framework/routing.dart b/packages/devtools_app/lib/src/shared/framework/routing.dart index 201272d7d51..e9929720dd5 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 'dart:collection'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 ca794a3bd5d..eacb7d9fb0d 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/service.dart'; import 'package:devtools_app_shared/shared.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/primitives/flutter_widgets/linked_scroll_controller.dart b/packages/devtools_app/lib/src/shared/primitives/flutter_widgets/linked_scroll_controller.dart index 122e8d0c7fa..8c64a6a7844 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:material_ui/material_ui.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 b252d764ca3..e40cf699791 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 'dart:math'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 a9a7d8b7fa2..c4cb624cc52 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/ui/common_widgets.dart b/packages/devtools_app/lib/src/shared/ui/common_widgets.dart index c3cc91d9bf3..2d34c956a7e 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/search.dart b/packages/devtools_app/lib/src/shared/ui/search.dart index ad823aa2881..7ea04674786 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:async/async.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/side_panel.dart b/packages/devtools_app/lib/src/shared/ui/side_panel.dart index 45feb3a4eeb..e45574e5c4c 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/utils.dart b/packages/devtools_app/lib/src/shared/ui/utils.dart index 51ba2679695..1857d5b62bf 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 'dart:math'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/utils/utils.dart b/packages/devtools_app/lib/src/shared/utils/utils.dart index eaa8772d340..eae789f69b6 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/service.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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/property_editor/property_editor_inputs.dart b/packages/devtools_app/lib/src/standalone_ui/ide_shared/property_editor/property_editor_inputs.dart index 831a296e492..7ca89f56c5f 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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/test/extensions/extension_screen_test.dart b/packages/devtools_app/test/extensions/extension_screen_test.dart index 243975131f0..036c5985fa0 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_shared/devtools_extensions.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 53d79c1aedd..9e172184c88 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_extensions.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 eedd4bc0a2d..3e8ff44be9a 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 2101f345997..0d71e6e7f99 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 359825c7418..39881b5880f 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/globals.dart'; 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:material_ui/material_ui.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 f41a395a266..4d850847bfe 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 dec33a1cf27..55aa4ce94f7 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 0b3ef5e092c..e6d3f5fa4d0 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 e57e6b266da..4e0c0b243c5 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 d133f2e25dc..f5a1a20e0a0 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 c6748422356..34dc608baa0 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 582026ef150..37ecbb3943c 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 751c6e3cc9b..c2af7812031 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_test_utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 d76303bbcc8..e0875386fae 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 bb23f76fa7f..6778b3e2615 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 2d2d3acdff9..f2ab3d6741c 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 7c551a359b9..f37e6e75bd4 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/file_import.dart'; 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:material_ui/material_ui.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 38d54b95407..188e171d047 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 49b74e9f102..b516b42c5b4 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 908725e5654..4e9b1873074 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 f5c2f123f80..8692075584d 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 aa906215c44..226e08add6a 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 a7ea1a13f54..98e7f6fb3c3 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 f830b987aa9..1b26cac4a02 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 5805550866c..18aff353c5e 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 3c3199958af..2432b554d54 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 c12cd560b3e..56201113654 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 0c4d12a5d5f..72ee8237d77 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 08c39ca20f0..4c3688fce1a 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 0bc7042b0fe..67d12388969 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 86f075a0fa0..221a2ab46dc 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/src/shared/ui/search.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; -import 'package:material_ui/material_ui.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 eac42737bd0..ac06a62793f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 21f6724267c..afde87f6f6c 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 1fdbca653ec..2588d53b356 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 @@ library; 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/src/shared/ui/colors.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:cupertino_ui/cupertino_ui.dart'; -import 'package:material_ui/material_ui.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 e19a2eeb2d6..aa503ecfb9e 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_shared/devtools_deeplink.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 338a3f0ff37..4a847b004d4 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 646c45b0d3c..407f8822fcc 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 6368a0ea7c6..afc43f2695c 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 f17d1882f57..c1768bd5cf8 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 c9ca9fe92bf..3bff21c152e 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 cf5ad047a9c..00cb66c6fff 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:material_ui/material_ui.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 ff945e5e299..e29a6f2d03f 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/src/shared/ui/tab.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 c7fd2ba069e..a33a076cd8d 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 2bba15a848d..e067c5a1036 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 4ed767c0fcf..05e7ba8bcbf 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:material_ui/material_ui.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 0daf452629e..f912a319244 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/console/eval/inspector_tree.dart'; 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:material_ui/material_ui.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 e76ef5535bb..42645ddb6a3 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/screens/inspector/layout_explorer/ui/theme.dart 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:material_ui/material_ui.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 9f77639cb46..8ab72032aaf 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:material_ui/material_ui.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 2342129b3c6..9546ab0e4b1 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:material_ui/material_ui.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 b8fed9a71ad..694cf72a97e 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/src/shared/diagnostics/primitives/source_location.d import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 dda2e3eded9..d90889c6278 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 481d4a25dea..f63dde498f8 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 f81be420c53..2a5c093c615 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/src/screens/logging/metadata.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 f7a22ee626e..219dcc2e945 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_shared.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 e1fa0b244ec..6a2b7684b9e 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/globals.dart'; 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:material_ui/material_ui.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 4a37f9b016e..1087e266dbc 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:material_ui/material_ui.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 e9602041ec4..751fde727d2 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/panes/diff/diff_pane.dart'; 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:material_ui/material_ui.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 ab083fe983e..7c8a7df91f8 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/framework/memory_tabs.dart'; 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:material_ui/material_ui.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 d32db41d868..e0282d61194 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/src/screens/memory/shared/heap/class_filter.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 7aef930fd90..7d11df4bd7e 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_shared.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 374ff4037b1..098a05f97d3 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_app/src/shared/table/table.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:flutter/gestures.dart'; -import 'package:material_ui/material_ui.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 d4390605681..487460c4b3b 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 99e3b4de4b8..9175ccbf598 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 58959704afc..2373bb6c18f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 16b964f9967..bea09dd4ae3 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 6775b7151a4..34caaac2370 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 20b2c8a7777..7a281725d4f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 0f9cf91db4d..920463ba37f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 4318218dd1f..257bfa2f070 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 52576894126..89cc1eafead 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 7c994c6a4fb..f929253f81c 100644 --- a/packages/devtools_app/test/screens/performance/performance_screen_test.dart +++ b/packages/devtools_app/test/screens/performance/performance_screen_test.dart @@ -18,9 +18,9 @@ import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_shared/devtools_test_utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 bc97f47cfed..76543e19d32 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 398ce2f4a4e..addff7f674d 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 374d8bbb384..bc45650d3a4 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 c7f6da272a0..cf7139c37e4 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 d00031bc965..c874fc7753f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 bbca5bbb935..63a14e081de 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 9410bcfa307..b684900a5ca 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 de97317004e..b8bd8d5ef19 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 04726e2db42..247bde893b3 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 a24c2d4d104..7bbffc88542 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 252d60cdd6c..a8c14e10910 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 233da65e50e..f6d6b9cdffa 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 1c6d70dc1a0..6744736695d 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 c01e62015f4..3eb00d45787 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 801a29b23d4..236a5cafc4c 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 92653e2c32f..3a1f0ed2e71 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 704e2480b07..1903fa05cca 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/src/shared/primitives/ansi_utils.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 7c427fd1176..391566414a3 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/src/shared/ui/utils.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; -import 'package:material_ui/material_ui.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 fd279f640bf..f5d24be6baa 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_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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 3fb5bfffbf0..29085ef6a68 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/devtools_app.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; -import 'package:material_ui/material_ui.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 aefc3511545..d1483bb107d 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/src/shared/primitives/query_parameters.dart'; import 'package:devtools_app_shared/shared.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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 21fa52880ac..6f7467143c5 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 578ac6662a6..aa182b2758b 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:material_ui/material_ui.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 601c765e082..98581e53e7e 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:material_ui/material_ui.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 c8c4f2cb208..a2ab62f8b22 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 { _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 e0d6127b8c9..2f1dfc2dc5e 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:material_ui/material_ui.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 2dd3d93cd55..8f02c37edcb 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 7a6e3894fb6..4fb28d40b27 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/src/shared/ui/editable_list.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 9bbed86c3ee..29025ddc6c0 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:material_ui/material_ui.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 2190d631bd8..c65860e46fe 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:material_ui/material_ui.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 60e8def7521..5bef4c19f01 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:material_ui/material_ui.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 db1d96a0105..98af5e52d6f 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:material_ui/material_ui.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. /// 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 0e16df0a75f..5b00688ee0f 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 2cb5a282f5a..1c38d4aa9b4 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 51a4ce2210f..a14c937b599 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 dcc2b8d0c15..4b9080a4b44 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:material_ui/material_ui.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 72bb359ce37..90933f11046 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 a9a45cd96d8..2c0a342dea6 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_shared/devtools_extensions.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; import 'package:dtd/dtd.dart'; -import 'package:material_ui/material_ui.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 02ec8a7933c..2203b4681e2 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:material_ui/material_ui.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/scenes/memory/default.dart b/packages/devtools_app/test/test_infra/scenes/memory/default.dart index 805fba430b6..58cf958300c 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_shared.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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 24dcda191ad..a5b4eb61353 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/ui.dart'; import 'package:devtools_app_shared/utils.dart'; import 'package:devtools_test/devtools_test.dart'; import 'package:devtools_test/helpers.dart'; -import 'package:material_ui/material_ui.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/scene_test_extensions.dart b/packages/devtools_app/test/test_infra/scenes/scene_test_extensions.dart index 822128bd9bc..ddd5440de27 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:material_ui/material_ui.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/utils/debugger_utils.dart b/packages/devtools_app/test/test_infra/utils/debugger_utils.dart index b02829a95e1..4f9b74e1e1c 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:material_ui/material_ui.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/lib/src/service/service_extensions.dart b/packages/devtools_app_shared/lib/src/service/service_extensions.dart index cb0f8d98251..89d75f118d5 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:material_ui/material_ui.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 { ServiceExtension({ diff --git a/packages/devtools_app_shared/test/test_utils.dart b/packages/devtools_app_shared/test/test_utils.dart index 464725d3640..29f61e0fc6f 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:material_ui/material_ui.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 9d14f0c2b13..3898a738941 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:material_ui/material_ui.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 5037ed5b612..0ca388a9d49 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:material_ui/material_ui.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 093d6c08678..567d3fe2fd9 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 'dart:async'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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 d06ca13e940..07660ed27a1 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:material_ui/material_ui.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 a088c974305..339077e6c68 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:material_ui/material_ui.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/integration_test/test/simulated_environment_test.dart b/packages/devtools_extensions/integration_test/test/simulated_environment_test.dart index f377d73ff0f..dc64acaf967 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_app_shared/ui.dart'; 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:material_ui/material_ui.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 d0a8536e126..bd346daf816 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 'dart:math' as math; import 'package:devtools_app_shared/service.dart'; import 'package:devtools_app_shared/ui.dart'; import 'package:devtools_app_shared/utils.dart'; -import 'package:material_ui/material_ui.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 99e8ae7f4b5..76bf9cba470 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_app_shared/utils.dart'; import 'package:devtools_shared/devtools_shared.dart'; import 'package:devtools_shared/service.dart'; import 'package:flutter/foundation.dart'; -import 'package:material_ui/material_ui.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; From 58f3df5ae2b8b4c549c67adb24eab0fd3f43e82a Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 12:50:05 -0700 Subject: [PATCH 13/18] Specify material_ui version in example --- third_party/packages/widget_icons/example/pubspec.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/third_party/packages/widget_icons/example/pubspec.yaml b/third_party/packages/widget_icons/example/pubspec.yaml index b4a105c3b2b..cef3b2b1e01 100644 --- a/third_party/packages/widget_icons/example/pubspec.yaml +++ b/third_party/packages/widget_icons/example/pubspec.yaml @@ -9,11 +9,9 @@ environment: dependencies: flutter: sdk: flutter - + material_ui: ^1.4.0 widget_icons: path: ../ - - material_ui: any dev_dependencies: flutter_test: sdk: flutter From a02624f7d0f1e54e74b1a1a830cd3d96accf44f4 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Wed, 23 Sep 2026 13:17:37 -0700 Subject: [PATCH 14/18] Add cupertino_ui to devtools_test with ignore: dependencies --- packages/devtools_test/pubspec.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index 197368a5d50..1162a7d1bb6 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml @@ -15,6 +15,8 @@ resolution: workspace 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: From 421b58c4c599ee63a3d89a18f94ccf62d5e1dd30 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Thu, 24 Sep 2026 08:40:29 -0700 Subject: [PATCH 15/18] 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. --- .../lib/src/shared/ui/side_panel.dart | 23 ++++++++++++++++++ .../test_infra/goldens/memory_diff_empty1.png | Bin 21479 -> 22770 bytes .../test_infra/goldens/memory_diff_empty2.png | Bin 21479 -> 22770 bytes 3 files changed, 23 insertions(+) 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 e45574e5c4c..6a11fe21eda 100644 --- a/packages/devtools_app/lib/src/shared/ui/side_panel.dart +++ b/packages/devtools_app/lib/src/shared/ui/side_panel.dart @@ -182,7 +182,30 @@ class SidePanel extends AnimatedWidget { : Expanded( child: Markdown( data: markdownData!, + // TODO(ryjohn): Upgrade to package:flutter_markdown_plus when + // it supports package:material_ui. package:flutter_markdown + // resolves Theme.of(context) using package:flutter/material.dart, + // falling back to light theme defaults unless styles are + // explicitly configured here. styleSheet: MarkdownStyleSheet( + p: theme.regularTextStyle, + blockquote: theme.regularTextStyle, + code: theme.regularTextStyle.copyWith( + fontFamily: 'monospace', + fontSize: + (theme.regularTextStyle.fontSize ?? 14.0) * 0.85, + ), + h1: theme.textTheme.headlineSmall, + h2: theme.textTheme.titleLarge, + h3: theme.textTheme.titleMedium, + h4: theme.textTheme.bodyLarge, + h5: theme.textTheme.bodyLarge, + h6: theme.textTheme.bodyLarge, + listBullet: theme.regularTextStyle, + tableBody: theme.regularTextStyle, + tableHead: theme.regularTextStyle.copyWith( + fontWeight: FontWeight.w600, + ), // [MarkdownStyleSheet.fromTheme], which supplies the // rest of the style sheet, hard codes // `Colors.blue.shade100` as the blockquote fill while 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 a4790c896d8de4b051371d28939ebfd697d7c8df..e8811c31fff595a246127d22fc94b8aa65fc8067 100644 GIT binary patch literal 22770 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 Date: Thu, 24 Sep 2026 09:11:51 -0700 Subject: [PATCH 16/18] Use MaterialUiCompatibilityBridge for markdown side panel --- packages/devtools_app/lib/src/app.dart | 37 +++++++++++-------- .../lib/src/shared/ui/side_panel.dart | 23 ------------ .../test/shared/ui/side_panel_test.dart | 3 ++ 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/packages/devtools_app/lib/src/app.dart b/packages/devtools_app/lib/src/app.dart index 21122e9155d..f1acdf5dfc2 100644 --- a/packages/devtools_app/lib/src/app.dart +++ b/packages/devtools_app/lib/src/app.dart @@ -475,22 +475,27 @@ class DevToolsAppState extends State with AutoDisposeMixin { message: 'Uh-oh, something went wrong. Please refresh the page.', ); } - return MultiProvider( - providers: [ - Provider.value( - value: widget.analyticsController, - ), - Provider.value(value: hoverCardController), - Provider.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.value( + value: widget.analyticsController, + ), + Provider.value(value: hoverCardController), + Provider.value( + value: releaseNotesController, + ), + ], + child: NotificationsView( + child: ReleaseNotesViewer( + controller: releaseNotesController, + child: DisconnectObserver( + routerDelegate: routerDelegate, + child: child, + ), ), ), ), 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 6a11fe21eda..e45574e5c4c 100644 --- a/packages/devtools_app/lib/src/shared/ui/side_panel.dart +++ b/packages/devtools_app/lib/src/shared/ui/side_panel.dart @@ -182,30 +182,7 @@ class SidePanel extends AnimatedWidget { : Expanded( child: Markdown( data: markdownData!, - // TODO(ryjohn): Upgrade to package:flutter_markdown_plus when - // it supports package:material_ui. package:flutter_markdown - // resolves Theme.of(context) using package:flutter/material.dart, - // falling back to light theme defaults unless styles are - // explicitly configured here. styleSheet: MarkdownStyleSheet( - p: theme.regularTextStyle, - blockquote: theme.regularTextStyle, - code: theme.regularTextStyle.copyWith( - fontFamily: 'monospace', - fontSize: - (theme.regularTextStyle.fontSize ?? 14.0) * 0.85, - ), - h1: theme.textTheme.headlineSmall, - h2: theme.textTheme.titleLarge, - h3: theme.textTheme.titleMedium, - h4: theme.textTheme.bodyLarge, - h5: theme.textTheme.bodyLarge, - h6: theme.textTheme.bodyLarge, - listBullet: theme.regularTextStyle, - tableBody: theme.regularTextStyle, - tableHead: theme.regularTextStyle.copyWith( - fontWeight: FontWeight.w600, - ), // [MarkdownStyleSheet.fromTheme], which supplies the // rest of the style sheet, hard codes // `Colors.blue.shade100` as the blockquote fill while 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 98af5e52d6f..d08f490b7fe 100644 --- a/packages/devtools_app/test/shared/ui/side_panel_test.dart +++ b/packages/devtools_app/test/shared/ui/side_panel_test.dart @@ -41,6 +41,9 @@ void main() { colorScheme: useDarkTheme ? darkColorScheme : lightColorScheme, ), ), + builder: (context, child) => + // ignore: deprecated_member_use + MaterialUiCompatibilityBridge(child: child!), home: SidePanelViewer(controller: controller), ), ); From feeb28ee8ead450b7483c6eed7cbcba7cc31f05f Mon Sep 17 00:00:00 2001 From: John Ryan Date: Thu, 24 Sep 2026 09:35:26 -0700 Subject: [PATCH 17/18] Add description to ignore --- packages/devtools_app/test/shared/ui/side_panel_test.dart | 2 +- pubspec.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d08f490b7fe..73a4700bb37 100644 --- a/packages/devtools_app/test/shared/ui/side_panel_test.dart +++ b/packages/devtools_app/test/shared/ui/side_panel_test.dart @@ -42,7 +42,7 @@ void main() { ), ), builder: (context, child) => - // ignore: deprecated_member_use + // ignore: deprecated_member_use, needed for markdown package MaterialUiCompatibilityBridge(child: child!), home: SidePanelViewer(controller: controller), ), diff --git a/pubspec.lock b/pubspec.lock index 100479f64ba..31b595daaa5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -987,10 +987,10 @@ packages: 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: From d70d114d47cd27889a816ba256324910c5af3b24 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Thu, 24 Sep 2026 10:08:05 -0700 Subject: [PATCH 18/18] Increase bundle size benchmark for material_ui --- packages/devtools_app/benchmark/web_bundle_size_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devtools_app/benchmark/web_bundle_size_test.dart b/packages/devtools_app/benchmark/web_bundle_size_test.dart index 20f7a7f3066..f9fa08fabd9 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: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', () {