From d9edd69eb805bf7f1c2b3820960c27adbca3d17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B5=D0=BE=D1=80=D0=B3=D0=B8=D0=B9?= Date: Mon, 7 Sep 2026 19:10:18 +0300 Subject: [PATCH 1/5] refactor(ui): migrate to standalone material_ui and cupertino_ui packages --- .../lib/core/constants/example_list_constant.dart | 2 +- example/lib/core/mixin/example_helper.dart | 2 +- example/lib/features/ai/ai_group_page.dart | 2 +- .../ai_replace_background_page_example.dart | 2 +- .../ai_replace_background_toolbar_widget.dart | 2 +- .../ai_text_commands_page_example.dart | 2 +- .../providers/ai_message_base_provider.dart | 2 +- .../providers/ai_message_gemini_provider.dart | 2 +- .../providers/ai_message_open_ai_provider.dart | 2 +- .../widgets/ai_command_input_widget.dart | 2 +- .../widgets/ai_command_toolbar_widget.dart | 2 +- .../widgets/ai_example_commands_widget.dart | 2 +- .../ai_text_commands/widgets/ai_setup_widget.dart | 2 +- .../background_remover_example.dart | 2 +- .../background_remover_stub_example.dart | 2 +- example/lib/features/crop_to_main_editor.dart | 2 +- .../lib/features/custom_guide_lines_example.dart | 2 +- .../lib/features/custom_path_builder_example.dart | 2 +- example/lib/features/custom_widgets_example.dart | 5 ++--- example/lib/features/default_example.dart | 2 +- .../features/design_examples/design_example.dart | 2 +- .../design_examples/frosted_glass_example.dart | 2 +- .../features/design_examples/grounded_example.dart | 3 +-- .../highly_configurable_example.dart | 3 +-- .../features/design_examples/whatsapp_example.dart | 2 +- example/lib/features/emoji_translate_example.dart | 2 +- .../lib/features/firebase_supabase_example.dart | 2 +- example/lib/features/frame_example.dart | 4 ++-- .../lib/features/generation_configs_example.dart | 4 ++-- example/lib/features/google_font_example.dart | 3 +-- .../lib/features/image_format_convert_example.dart | 2 +- example/lib/features/import_export_example.dart | 2 +- .../lib/features/layer/layer_export_example.dart | 2 +- example/lib/features/layer/layer_group_page.dart | 2 +- .../lib/features/layer/layer_grouping_example.dart | 2 +- .../features/layer/layer_rasterizer_example.dart | 2 +- .../layer/layer_select_design_example.dart | 2 +- .../features/layer/selectable_layer_example.dart | 2 +- example/lib/features/movable_background_image.dart | 3 ++- example/lib/features/pick_image_example.dart | 3 +-- example/lib/features/preview/preview_img.dart | 2 +- example/lib/features/preview/preview_video.dart | 2 +- example/lib/features/reorder_layer_example.dart | 2 +- example/lib/features/round_cropper_example.dart | 2 +- .../lib/features/signature_drawing_example.dart | 2 +- example/lib/features/standalone_example.dart | 2 +- example/lib/features/stickers_example.dart | 2 +- .../video_examples/mixins/video_editor_mixin.dart | 2 +- .../pages/chewie_player_example.dart | 2 +- .../pages/flick_video_player_example.dart | 2 +- .../pages/video_media_kit_example.dart | 2 +- .../video_examples/pages/video_player_example.dart | 2 +- .../lib/features/video_examples/video_example.dart | 2 +- .../widgets/video_initializing_widget.dart | 2 +- example/lib/features/zoom_example.dart | 2 +- example/lib/main.dart | 3 +-- .../lib/shared/widgets/demo_build_stickers.dart | 2 +- .../lib/shared/widgets/material_icon_button.dart | 2 +- example/lib/shared/widgets/not_found_example.dart | 2 +- .../lib/shared/widgets/prepare_image_widget.dart | 2 +- .../lib/shared/widgets/video_progress_alert.dart | 2 +- example/linux/flutter/generated_plugins.cmake | 1 + .../macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- example/pubspec.yaml | 2 ++ example/windows/flutter/generated_plugins.cmake | 1 + lib/core/mixins/editor_callbacks_mixin.dart | 2 +- lib/core/mixins/editor_configs_mixin.dart | 2 +- lib/core/mixins/standalone_editor.dart | 2 +- .../editor_configs/crop_rotate_editor_configs.dart | 2 +- .../editor_configs/pro_image_editor_configs.dart | 2 +- .../models/editor_configs/text_editor_configs.dart | 2 +- lib/core/models/editor_image.dart | 2 +- lib/core/models/icons/audio_editor_icons.dart | 2 +- lib/core/models/icons/blur_editor_icons.dart | 2 +- lib/core/models/icons/clips_editor_icons.dart | 2 +- .../models/icons/crop_rotate_editor_icons.dart | 2 +- lib/core/models/icons/emoji_editor_icons.dart | 2 +- lib/core/models/icons/filter_editor_icons.dart | 2 +- lib/core/models/icons/layer_interaction_icons.dart | 2 +- lib/core/models/icons/main_editor_icons.dart | 2 +- lib/core/models/icons/paint_editor_icons.dart | 2 +- lib/core/models/icons/sticker_editor_icons.dart | 2 +- lib/core/models/icons/text_editor_icons.dart | 2 +- lib/core/models/icons/tune_editor_icons.dart | 2 +- lib/core/models/icons/video_editor_icons.dart | 2 +- .../models/init_configs/editor_init_configs.dart | 2 +- lib/core/models/layers/layer.dart | 2 +- .../models/styles/layer_interaction_style.dart | 2 +- lib/core/models/styles/text_editor_style.dart | 2 +- lib/core/models/styles/video_editor_style.dart | 2 +- .../widgets/appbar/frosted_glass_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_audio_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_blur_appbar.dart | 2 +- .../appbar/frosted_glass_clip_edit_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_clips_appbar.dart | 2 +- .../appbar/frosted_glass_filter_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_paint_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_text_appbar.dart | 2 +- .../widgets/appbar/frosted_glass_tune_appbar.dart | 2 +- .../bottombar/frosted_glass_paint_bottombar.dart | 2 +- .../bottombar/frosted_glass_text_bottombar.dart | 2 +- .../bottombar/frosted_glass_tune_bottombar.dart | 2 +- .../widgets/frosted_glass_close_dialog.dart | 2 +- .../widgets/frosted_glass_crop_rotate_toolbar.dart | 4 ++-- .../widgets/frosted_glass_effect.dart | 2 +- .../widgets/frosted_glass_loading_dialog.dart | 2 +- .../widgets/frosted_glass_sticker_editor.dart | 4 ++-- .../widgets/frosted_glass_text_size_slider.dart | 2 +- .../widgets/bottombar/grounded_audio_bar.dart | 2 +- .../widgets/bottombar/grounded_blur_bar.dart | 6 ++---- .../widgets/bottombar/grounded_bottom_bar.dart | 2 +- .../widgets/bottombar/grounded_clip_edit_bar.dart | 2 +- .../widgets/bottombar/grounded_clips_bar.dart | 2 +- .../bottombar/grounded_crop_rotate_bar.dart | 10 +++------- .../widgets/bottombar/grounded_filter_bar.dart | 6 ++---- .../widgets/bottombar/grounded_main_bar.dart | 2 +- .../widgets/bottombar/grounded_paint_bar.dart | 14 ++++---------- .../widgets/bottombar/grounded_text_bar.dart | 10 +++------- .../widgets/bottombar/grounded_tune_bar.dart | 2 +- .../grounded/widgets/grounded_bottom_wrapper.dart | 2 +- .../grounded/widgets/grounded_emoji_editor.dart | 4 ++-- .../grounded/widgets/grounded_loading_dialog.dart | 2 +- .../grounded/widgets/grounded_sticker_editor.dart | 4 ++-- .../widgets/grounded_text_size_slider.dart | 2 +- .../painter/float_select_border_painter.dart | 2 +- .../utils/float_select_transparent_hit_test.dart | 2 +- .../widgets/float_select_resize_handler.dart | 2 +- .../float_select/widgets/float_select_toolbar.dart | 2 +- .../widgets/float_select_toolbar_button.dart | 2 +- .../widgets/float_selection_overlay.dart | 2 +- .../styles/whatsapp_appbar_button_style.dart | 2 +- lib/designs/whatsapp/whatsapp_color_picker.dart | 2 +- .../whatsapp/whatsapp_crop_rotate_toolbar.dart | 4 ++-- lib/designs/whatsapp/whatsapp_done_btn.dart | 4 ++-- .../whatsapp/whatsapp_paint_colorpicker.dart | 2 +- lib/designs/whatsapp/whatsapp_sticker_editor.dart | 4 ++-- .../whatsapp/whatsapp_text_colorpicker.dart | 2 +- .../whatsapp/whatsapp_text_size_slider.dart | 2 +- .../whatsapp/widgets/appbar/whatsapp_appbar.dart | 2 +- .../widgets/appbar/whatsapp_paint_appbar.dart | 2 +- .../widgets/appbar/whatsapp_text_appbar.dart | 2 +- .../bottombar/whatsapp_paint_bottombar.dart | 2 +- .../widgets/bottombar/whatsapp_text_bottombar.dart | 2 +- .../widgets/filter/whatsapp_filter_button.dart | 2 +- .../whatsapp/widgets/filter/whatsapp_filters.dart | 2 +- .../filter/whatsapp_open_filter_button.dart | 2 +- lib/features/audio_editor/audio_editor_page.dart | 4 ++-- .../audio_editor/widgets/audio_editor_app_bar.dart | 2 +- .../widgets/audio_main_bottom_bar.dart | 2 +- .../widgets/audio_track_list_tile.dart | 2 +- lib/features/blur_editor/blur_editor.dart | 4 ++-- .../blur_editor/widgets/blur_editor_appbar.dart | 2 +- .../blur_editor/widgets/blur_editor_bottombar.dart | 2 +- .../clips_editor/pages/clips_editor_edit_page.dart | 2 +- .../clips_editor/pages/clips_editor_page.dart | 4 ++-- .../clips_editor/widgets/clips_editor_app_bar.dart | 2 +- .../widgets/clips_editor_edit_app_bar.dart | 2 +- .../widgets/clips_editor_list_tile.dart | 2 +- .../crop_rotate_editor/crop_rotate_editor.dart | 2 +- .../mixins/crop_area_history.dart | 2 +- .../services/crop_desktop_interaction_manager.dart | 2 +- .../widgets/crop_aspect_ratio_button.dart | 2 +- .../widgets/crop_aspect_ratio_options.dart | 2 +- .../widgets/crop_corner_painter.dart | 2 +- .../widgets/crop_editor_appbar.dart | 2 +- .../widgets/crop_editor_bottombar.dart | 2 +- .../widgets/crop_layer_painter.dart | 2 +- .../widgets/tilt/tilt_item_row.dart | 2 +- .../widgets/tilt/tilt_ruler.dart | 2 +- .../widgets/tilt/tilt_ruler_chooser.dart | 2 +- lib/features/emoji_editor/emoji_editor.dart | 4 ++-- .../emoji_editor/services/emoji_state_manager.dart | 2 +- .../emoji_editor/widgets/emoji_cell_extended.dart | 2 +- .../widgets/emoji_editor_bottom_bar.dart | 2 +- .../widgets/emoji_editor_category_view.dart | 2 +- .../widgets/emoji_editor_full_screen_search.dart | 2 +- .../widgets/emoji_editor_header_search.dart | 2 +- .../emoji_editor/widgets/emoji_picker_view.dart | 2 +- lib/features/filter_editor/filter_editor.dart | 4 ++-- .../widgets/filter_editor_appbar.dart | 2 +- .../widgets/filter_editor_item_list.dart | 2 +- .../filter_editor/widgets/filtered_widget.dart | 2 +- lib/features/main_editor/main_editor.dart | 2 +- .../services/desktop_interaction_manager.dart | 3 +-- .../services/layer_interaction_manager.dart | 2 +- .../services/main_editor_layers_service.dart | 2 +- .../main_editor_state_history_service.dart | 2 +- .../main_editor/services/sizes_manager.dart | 2 +- .../main_editor/widgets/main_editor_appbar.dart | 2 +- .../widgets/main_editor_background_image.dart | 2 +- .../widgets/main_editor_background_video.dart | 2 +- .../main_editor/widgets/main_editor_bottombar.dart | 2 +- .../widgets/main_editor_font_preloader.dart | 2 +- .../widgets/main_editor_helper_lines.dart | 2 +- .../widgets/main_editor_interactive_content.dart | 2 +- .../main_editor/widgets/main_editor_layers.dart | 2 +- .../widgets/main_editor_remove_layer_area.dart | 2 +- .../paint_editor/controllers/paint_controller.dart | 2 +- lib/features/paint_editor/paint_editor.dart | 2 +- .../paint_desktop_interaction_manager.dart | 2 +- .../paint_editor/widgets/draw_paint_item.dart | 2 +- .../paint_editor/widgets/paint_canvas.dart | 2 +- .../paint_editor/widgets/paint_editor_appbar.dart | 2 +- .../widgets/paint_editor_bottombar.dart | 2 +- .../widgets/paint_editor_color_picker.dart | 2 +- .../widgets/paint_editor_layer_editor.dart | 2 +- lib/features/sticker_editor/sticker_editor.dart | 4 ++-- lib/features/text_editor/text_editor.dart | 4 ++-- .../utils/rounded_background_painter.dart | 2 +- .../rounded_background_text.dart | 2 +- .../rounded_background_text_field.dart | 2 +- .../text_editor/widgets/text_editor_appbar.dart | 2 +- .../widgets/text_editor_bottom_bar.dart | 2 +- .../widgets/text_editor_color_picker.dart | 2 +- .../text_editor/widgets/text_editor_input.dart | 2 +- .../tune_editor/models/tune_adjustment_item.dart | 2 +- lib/features/tune_editor/tune_editor.dart | 4 ++-- .../tune_editor/widgets/tune_editor_appbar.dart | 2 +- .../tune_editor/widgets/tune_editor_bottombar.dart | 2 +- lib/plugins/defer_pointer/defer_pointer.dart | 7 ++++--- .../locales/default_emoji_set_locale.dart | 2 +- .../src/bottom_action_bar/bottom_action_bar.dart | 2 +- .../bottom_action_bar_config.dart | 2 +- .../default_bottom_action_bar.dart | 2 +- .../src/category_view/category_icon.dart | 2 +- .../src/category_view/category_icons.dart | 2 +- .../src/category_view/category_view.dart | 2 +- .../src/category_view/category_view_config.dart | 2 +- .../category_view/default_category_tab_bar.dart | 2 +- .../src/category_view/default_category_view.dart | 2 +- lib/plugins/emoji_picker_flutter/src/config.dart | 2 +- lib/plugins/emoji_picker_flutter/src/emoji.dart | 2 +- .../emoji_picker_flutter/src/emoji_picker.dart | 2 +- .../src/emoji_picker_utils.dart | 2 +- .../emoji_picker_flutter/src/emoji_text_style.dart | 2 +- .../src/emoji_view/default_emoji_picker_view.dart | 2 +- .../src/emoji_view/emoji_container.dart | 2 +- .../src/emoji_view/emoji_picker_view.dart | 2 +- .../src/emoji_view/emoji_view_config.dart | 2 +- .../emoji_picker_flutter/src/emoji_view_state.dart | 2 +- .../src/search_view/default_search_view.dart | 6 ++---- .../src/search_view/search_view.dart | 2 +- .../src/search_view/search_view_config.dart | 2 +- .../src/skin_tones/skin_tone_config.dart | 2 +- .../src/skin_tones/skin_tone_overlay.dart | 2 +- .../src/skin_tones/triangle_decoration.dart | 2 +- .../src/widgets/backspace_button.dart | 2 +- .../src/widgets/emoji_cell.dart | 4 ++-- .../src/widgets/search_button.dart | 2 +- .../extensions/box_constraints_extension.dart | 2 +- lib/shared/extensions/color_extension.dart | 2 +- .../controllers/content_recorder_controller.dart | 2 +- .../services/image_render_service.dart | 2 +- .../utils/generate_high_quality_image.dart | 2 +- .../content_recorder/widgets/content_recorder.dart | 2 +- .../layer_rasterizer/layer_rasterizer_host.dart | 2 +- lib/shared/styles/platform_text_styles.dart | 4 ++-- lib/shared/utils/default_editor_theme.dart | 2 +- lib/shared/widgets/adaptive_dialog.dart | 4 ++-- lib/shared/widgets/animated/fade_in_base.dart | 2 +- lib/shared/widgets/animated/fade_in_left.dart | 2 +- lib/shared/widgets/animated/fade_in_up.dart | 2 +- lib/shared/widgets/bottom_sheets_header_row.dart | 2 +- lib/shared/widgets/censor/pixelate_area_item.dart | 2 +- .../widgets/color_picker/bar_color_picker.dart | 4 ++-- lib/shared/widgets/editor_scrollbar.dart | 2 +- lib/shared/widgets/flat_icon_text_button.dart | 2 +- .../layer_interaction_button.dart | 2 +- .../layer_interaction_helper_widget.dart | 2 +- .../layer/layer_drag_selection_area_widget.dart | 2 +- lib/shared/widgets/layer/layer_stack.dart | 2 +- lib/shared/widgets/layer/layer_widget.dart | 4 ++-- .../layer/services/layer_widget_context_menu.dart | 2 +- .../layer/widgets/layer_widget_censor_item.dart | 2 +- .../layer/widgets/layer_widget_custom_item.dart | 2 +- .../layer/widgets/layer_widget_emoji_item.dart | 2 +- .../layer/widgets/layer_widget_paint_item.dart | 2 +- .../layer/widgets/layer_widget_text_item.dart | 2 +- .../overlays/loading_dialog/loading_dialog.dart | 4 ++-- .../models/loading_dialog_overlay_details.dart | 2 +- .../platform_circular_progress_indicator.dart | 4 ++-- .../widgets/platform/platform_popup_menu.dart | 4 ++-- .../reactive_widgets/reactive_custom_appbar.dart | 2 +- lib/shared/widgets/screen_resize_detector.dart | 2 +- lib/shared/widgets/slider_bottom_sheet.dart | 2 +- .../transform/transformed_content_generator.dart | 2 +- .../video_editor_prebuild_remove_area.dart | 2 +- .../video/toolbar/video_editor_info_banner.dart | 2 +- .../video/toolbar/video_editor_mute_button.dart | 2 +- .../video/toolbar/video_editor_play_button.dart | 2 +- .../trimmer/video_editor_play_time_indicator.dart | 2 +- .../video/trimmer/video_editor_trim_bar.dart | 2 +- .../video/trimmer/video_editor_trim_handle.dart | 2 +- .../video/trimmer/video_editor_trim_skeleton.dart | 2 +- .../trimmer/video_editor_trim_thumbnail_bar.dart | 3 ++- .../widgets/video/video_editor_configurable.dart | 2 +- .../video/video_editor_controls_widget.dart | 2 +- .../widgets/video/video_editor_state_widget.dart | 2 +- pubspec.yaml | 2 ++ test/core/models/layers/layer_capture_test.dart | 2 +- test/core/models/layers/layer_test.dart | 2 +- test/core/models/layers/paint_layer_test.dart | 2 +- test/core/models/layers/text_layer_test.dart | 2 +- test/core/models/layers/widget_layer_test.dart | 2 +- test/features/blur_editor_test.dart | 3 +-- .../crop_rotate_editor_test.dart | 4 ++-- .../widgets/crop_aspect_ratio_options_test.dart | 3 +-- .../widgets/crop_corner_painter_test.dart | 13 ++++++------- .../widgets/tilt/tilt_item_row_test.dart | 2 +- .../widgets/tilt/tilt_ruler_chooser_test.dart | 2 +- .../widgets/tilt/tilt_ruler_test.dart | 2 +- test/features/emoji_editor_test.dart | 2 +- test/features/filter_editor_test.dart | 3 +-- test/features/main_editor/merge_filters_test.dart | 4 +--- .../main_editor/merge_selected_layers_test.dart | 4 +--- .../main_editor/multitouch_third_finger_test.dart | 4 +--- .../services/paint_layer_merge_manager_test.dart | 2 +- test/features/main_editor/sizes_manager_test.dart | 4 +--- test/features/main_editor_test.dart | 4 +--- test/features/paint_editor/paint_editor_test.dart | 3 +-- .../paint_editor/painting_canvas_test.dart | 3 +-- .../paint_editor/utils/draw/draw_canvas_test.dart | 2 +- .../paint_editor/utils/paint_controller_test.dart | 2 +- .../widgets/paint_editor_layer_editor_test.dart | 2 +- test/features/sticker_editor_test.dart | 4 +--- .../rounded_background_text_field_hitbox_test.dart | 2 +- test/features/text_editor_test.dart | 3 +-- test/features/tune_editor_test.dart | 2 +- test/mock/layers/paint_layer_mock.dart | 2 +- test/mock/layers/text_layer_mock.dart | 2 +- test/mock/layers/widget_layer_mock.dart | 2 +- test/models/editor_image_test.dart | 5 ++--- test/shared/factories/editor_mapper_test.dart | 2 +- .../services/import_export/import_export_test.dart | 3 ++- .../import_export/import_state_history_test.dart | 2 +- .../layer_rasterizer_host_test.dart | 2 +- .../layer_rasterizer/layer_rasterizer_test.dart | 2 +- .../services/layer_transform_generator_test.dart | 2 +- test/shared/styles/platform_text_styles_test.dart | 4 ++-- test/shared/widgets/auto_image_test.dart | 3 +-- .../color_picker/bar_color_picker_test.dart | 4 +--- test/shared/widgets/layer_widget_test.dart | 4 +--- 342 files changed, 394 insertions(+), 436 deletions(-) diff --git a/example/lib/core/constants/example_list_constant.dart b/example/lib/core/constants/example_list_constant.dart index 31f0b25b5..e12f68657 100644 --- a/example/lib/core/constants/example_list_constant.dart +++ b/example/lib/core/constants/example_list_constant.dart @@ -1,5 +1,5 @@ import 'package:example/features/layer/layer_group_page.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/ai/ai_group_page.dart'; import '/features/crop_to_main_editor.dart'; diff --git a/example/lib/core/mixin/example_helper.dart b/example/lib/core/mixin/example_helper.dart index 1a73d09d0..631ab660b 100644 --- a/example/lib/core/mixin/example_helper.dart +++ b/example/lib/core/mixin/example_helper.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:vibration/vibration.dart'; diff --git a/example/lib/features/ai/ai_group_page.dart b/example/lib/features/ai/ai_group_page.dart index 4931c22be..d35accd9d 100644 --- a/example/lib/features/ai/ai_group_page.dart +++ b/example/lib/features/ai/ai_group_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'ai_replace_background/ai_replace_background_page_example.dart'; import 'ai_text_commands/ai_text_commands_page_example.dart'; diff --git a/example/lib/features/ai/ai_replace_background/ai_replace_background_page_example.dart b/example/lib/features/ai/ai_replace_background/ai_replace_background_page_example.dart index e840fe7bc..7bdd8d0bb 100644 --- a/example/lib/features/ai/ai_replace_background/ai_replace_background_page_example.dart +++ b/example/lib/features/ai/ai_replace_background/ai_replace_background_page_example.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/example_constants.dart'; diff --git a/example/lib/features/ai/ai_replace_background/widgets/ai_replace_background_toolbar_widget.dart b/example/lib/features/ai/ai_replace_background/widgets/ai_replace_background_toolbar_widget.dart index 5e121f88e..cfa659aed 100644 --- a/example/lib/features/ai/ai_replace_background/widgets/ai_replace_background_toolbar_widget.dart +++ b/example/lib/features/ai/ai_replace_background/widgets/ai_replace_background_toolbar_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A stateless widget for inputting and sending AI text commands. class AiReplaceBackgroundToolbarWidget extends StatelessWidget { diff --git a/example/lib/features/ai/ai_text_commands/ai_text_commands_page_example.dart b/example/lib/features/ai/ai_text_commands/ai_text_commands_page_example.dart index 0c00c8bc7..6e91de81b 100644 --- a/example/lib/features/ai/ai_text_commands/ai_text_commands_page_example.dart +++ b/example/lib/features/ai/ai_text_commands/ai_text_commands_page_example.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/example_constants.dart'; diff --git a/example/lib/features/ai/ai_text_commands/providers/ai_message_base_provider.dart b/example/lib/features/ai/ai_text_commands/providers/ai_message_base_provider.dart index 6731aaa67..81d13bde5 100644 --- a/example/lib/features/ai/ai_text_commands/providers/ai_message_base_provider.dart +++ b/example/lib/features/ai/ai_text_commands/providers/ai_message_base_provider.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '../enum/ai_provider_enum.dart'; diff --git a/example/lib/features/ai/ai_text_commands/providers/ai_message_gemini_provider.dart b/example/lib/features/ai/ai_text_commands/providers/ai_message_gemini_provider.dart index 503bdad30..dd394f717 100644 --- a/example/lib/features/ai/ai_text_commands/providers/ai_message_gemini_provider.dart +++ b/example/lib/features/ai/ai_text_commands/providers/ai_message_gemini_provider.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '../enum/ai_provider_enum.dart'; diff --git a/example/lib/features/ai/ai_text_commands/providers/ai_message_open_ai_provider.dart b/example/lib/features/ai/ai_text_commands/providers/ai_message_open_ai_provider.dart index 651df9b6c..1d5d0a555 100644 --- a/example/lib/features/ai/ai_text_commands/providers/ai_message_open_ai_provider.dart +++ b/example/lib/features/ai/ai_text_commands/providers/ai_message_open_ai_provider.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '../enum/ai_provider_enum.dart'; diff --git a/example/lib/features/ai/ai_text_commands/widgets/ai_command_input_widget.dart b/example/lib/features/ai/ai_text_commands/widgets/ai_command_input_widget.dart index 8eeaf9740..69dcaea65 100644 --- a/example/lib/features/ai/ai_text_commands/widgets/ai_command_input_widget.dart +++ b/example/lib/features/ai/ai_text_commands/widgets/ai_command_input_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../enum/ai_generation_mode_enum.dart'; diff --git a/example/lib/features/ai/ai_text_commands/widgets/ai_command_toolbar_widget.dart b/example/lib/features/ai/ai_text_commands/widgets/ai_command_toolbar_widget.dart index ad74d7914..18c90e549 100644 --- a/example/lib/features/ai/ai_text_commands/widgets/ai_command_toolbar_widget.dart +++ b/example/lib/features/ai/ai_text_commands/widgets/ai_command_toolbar_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../enum/ai_generation_mode_enum.dart'; import '../widgets/ai_command_input_widget.dart'; diff --git a/example/lib/features/ai/ai_text_commands/widgets/ai_example_commands_widget.dart b/example/lib/features/ai/ai_text_commands/widgets/ai_example_commands_widget.dart index a022e2749..1ffccacd7 100644 --- a/example/lib/features/ai/ai_text_commands/widgets/ai_example_commands_widget.dart +++ b/example/lib/features/ai/ai_text_commands/widgets/ai_example_commands_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/shared/services/shader_manager.dart'; /// A widget that displays a list of example AI text commands for image editing. diff --git a/example/lib/features/ai/ai_text_commands/widgets/ai_setup_widget.dart b/example/lib/features/ai/ai_text_commands/widgets/ai_setup_widget.dart index 6fb375af5..69448043f 100644 --- a/example/lib/features/ai/ai_text_commands/widgets/ai_setup_widget.dart +++ b/example/lib/features/ai/ai_text_commands/widgets/ai_setup_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../enum/ai_provider_enum.dart'; diff --git a/example/lib/features/ai/background_remover/background_remover_example.dart b/example/lib/features/ai/background_remover/background_remover_example.dart index a3f6c6e53..027b1e0ff 100644 --- a/example/lib/features/ai/background_remover/background_remover_example.dart +++ b/example/lib/features/ai/background_remover/background_remover_example.dart @@ -2,9 +2,9 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:image_background_remover/image_background_remover.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; // Project imports: diff --git a/example/lib/features/ai/background_remover/background_remover_stub_example.dart b/example/lib/features/ai/background_remover/background_remover_stub_example.dart index beaafaa1a..9514898ff 100644 --- a/example/lib/features/ai/background_remover/background_remover_stub_example.dart +++ b/example/lib/features/ai/background_remover/background_remover_stub_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/mixin/example_helper.dart'; diff --git a/example/lib/features/crop_to_main_editor.dart b/example/lib/features/crop_to_main_editor.dart index 6cf85cddb..06d484fd6 100644 --- a/example/lib/features/crop_to_main_editor.dart +++ b/example/lib/features/crop_to_main_editor.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/custom_guide_lines_example.dart b/example/lib/features/custom_guide_lines_example.dart index b3321ed58..d514bc01d 100644 --- a/example/lib/features/custom_guide_lines_example.dart +++ b/example/lib/features/custom_guide_lines_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/custom_path_builder_example.dart b/example/lib/features/custom_path_builder_example.dart index 040d69677..45066a1de 100644 --- a/example/lib/features/custom_path_builder_example.dart +++ b/example/lib/features/custom_path_builder_example.dart @@ -1,7 +1,7 @@ // Flutter imports: import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/custom_widgets_example.dart b/example/lib/features/custom_widgets_example.dart index a925404af..5cdfcebb1 100644 --- a/example/lib/features/custom_widgets_example.dart +++ b/example/lib/features/custom_widgets_example.dart @@ -1,11 +1,10 @@ // Dart imports: import 'dart:math'; -// Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:google_fonts/google_fonts.dart'; +// Flutter imports: +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; // Project imports: diff --git a/example/lib/features/default_example.dart b/example/lib/features/default_example.dart index 39fb68d62..42dc0b784 100644 --- a/example/lib/features/default_example.dart +++ b/example/lib/features/default_example.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/example_constants.dart'; diff --git a/example/lib/features/design_examples/design_example.dart b/example/lib/features/design_examples/design_example.dart index 040e9ecca..fd8e180a8 100644 --- a/example/lib/features/design_examples/design_example.dart +++ b/example/lib/features/design_examples/design_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/example_constants.dart'; diff --git a/example/lib/features/design_examples/frosted_glass_example.dart b/example/lib/features/design_examples/frosted_glass_example.dart index 6ebcee3e9..d557c5748 100644 --- a/example/lib/features/design_examples/frosted_glass_example.dart +++ b/example/lib/features/design_examples/frosted_glass_example.dart @@ -2,8 +2,8 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/designs/frosted_glass/frosted_glass.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/design_examples/grounded_example.dart b/example/lib/features/design_examples/grounded_example.dart index bbaeadceb..ff80079c9 100644 --- a/example/lib/features/design_examples/grounded_example.dart +++ b/example/lib/features/design_examples/grounded_example.dart @@ -2,10 +2,9 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:google_fonts/google_fonts.dart'; - +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/designs/grounded/grounded_design.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/design_examples/highly_configurable_example.dart b/example/lib/features/design_examples/highly_configurable_example.dart index e0f608436..ef259e585 100644 --- a/example/lib/features/design_examples/highly_configurable_example.dart +++ b/example/lib/features/design_examples/highly_configurable_example.dart @@ -1,9 +1,8 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - // Package imports: import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; // Project imports: diff --git a/example/lib/features/design_examples/whatsapp_example.dart b/example/lib/features/design_examples/whatsapp_example.dart index d5e7d2163..75bf766ed 100644 --- a/example/lib/features/design_examples/whatsapp_example.dart +++ b/example/lib/features/design_examples/whatsapp_example.dart @@ -4,9 +4,9 @@ import 'dart:math'; // Flutter imports: import 'package:example/shared/widgets/demo_build_stickers.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; // Package imports: import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/designs/whatsapp/whatsapp.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/emoji_translate_example.dart b/example/lib/features/emoji_translate_example.dart index c21e614be..6a216b8ad 100644 --- a/example/lib/features/emoji_translate_example.dart +++ b/example/lib/features/emoji_translate_example.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/example_constants.dart'; diff --git a/example/lib/features/firebase_supabase_example.dart b/example/lib/features/firebase_supabase_example.dart index aa3bd76a8..efb0ff072 100644 --- a/example/lib/features/firebase_supabase_example.dart +++ b/example/lib/features/firebase_supabase_example.dart @@ -1,7 +1,7 @@ // Package imports: import 'package:firebase_storage/firebase_storage.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; diff --git a/example/lib/features/frame_example.dart b/example/lib/features/frame_example.dart index 5af8d4c6d..e7f10f1f1 100644 --- a/example/lib/features/frame_example.dart +++ b/example/lib/features/frame_example.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/utils/transparent_image_generator_utils.dart'; diff --git a/example/lib/features/generation_configs_example.dart b/example/lib/features/generation_configs_example.dart index 50049fcc3..238598a64 100644 --- a/example/lib/features/generation_configs_example.dart +++ b/example/lib/features/generation_configs_example.dart @@ -1,8 +1,8 @@ // Flutter imports: import 'dart:ui' as ui; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/google_font_example.dart b/example/lib/features/google_font_example.dart index 0d6622d45..1792e7eb1 100644 --- a/example/lib/features/google_font_example.dart +++ b/example/lib/features/google_font_example.dart @@ -3,10 +3,9 @@ import 'dart:io'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - // Package imports: import 'package:google_fonts/google_fonts.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; // Project imports: diff --git a/example/lib/features/image_format_convert_example.dart b/example/lib/features/image_format_convert_example.dart index 1a02c0560..4811f3f80 100644 --- a/example/lib/features/image_format_convert_example.dart +++ b/example/lib/features/image_format_convert_example.dart @@ -3,7 +3,7 @@ import 'dart:io'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/import_export_example.dart b/example/lib/features/import_export_example.dart index 0e76f12cc..e9e9e8086 100644 --- a/example/lib/features/import_export_example.dart +++ b/example/lib/features/import_export_example.dart @@ -1,5 +1,5 @@ import 'package:example/core/constants/example_constants.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '/core/constants/history_demo/import_history_6_3_0_minified.dart'; diff --git a/example/lib/features/layer/layer_export_example.dart b/example/lib/features/layer/layer_export_example.dart index 4cc60cc80..1ecf047ae 100644 --- a/example/lib/features/layer/layer_export_example.dart +++ b/example/lib/features/layer/layer_export_example.dart @@ -1,7 +1,7 @@ // Flutter imports: import 'dart:ui'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/layer/layer_group_page.dart b/example/lib/features/layer/layer_group_page.dart index c50a3cdf8..a3d466d84 100644 --- a/example/lib/features/layer/layer_group_page.dart +++ b/example/lib/features/layer/layer_group_page.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/layer/layer_export_example.dart'; import '/features/layer/layer_grouping_example.dart'; diff --git a/example/lib/features/layer/layer_grouping_example.dart b/example/lib/features/layer/layer_grouping_example.dart index 6e5359ee6..2c637de75 100644 --- a/example/lib/features/layer/layer_grouping_example.dart +++ b/example/lib/features/layer/layer_grouping_example.dart @@ -1,5 +1,5 @@ import 'package:example/core/constants/example_constants.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/widgets/layer/interaction_helper/layer_interaction_button.dart'; diff --git a/example/lib/features/layer/layer_rasterizer_example.dart b/example/lib/features/layer/layer_rasterizer_example.dart index 9a26172b5..778e49c4f 100644 --- a/example/lib/features/layer/layer_rasterizer_example.dart +++ b/example/lib/features/layer/layer_rasterizer_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/layer/layer_select_design_example.dart b/example/lib/features/layer/layer_select_design_example.dart index f3d70427a..19ab2455f 100644 --- a/example/lib/features/layer/layer_select_design_example.dart +++ b/example/lib/features/layer/layer_select_design_example.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/designs/layer_selection/float_select/float_select.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/layer/selectable_layer_example.dart b/example/lib/features/layer/selectable_layer_example.dart index 53fd345a0..51fb3c5f2 100644 --- a/example/lib/features/layer/selectable_layer_example.dart +++ b/example/lib/features/layer/selectable_layer_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/movable_background_image.dart b/example/lib/features/movable_background_image.dart index 71981dbc1..b0a9e883f 100644 --- a/example/lib/features/movable_background_image.dart +++ b/example/lib/features/movable_background_image.dart @@ -1,6 +1,7 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; + import '/core/mixin/example_helper.dart'; import '/shared/widgets/pixel_transparent_painter.dart'; diff --git a/example/lib/features/pick_image_example.dart b/example/lib/features/pick_image_example.dart index cbf068a6f..33198ffae 100644 --- a/example/lib/features/pick_image_example.dart +++ b/example/lib/features/pick_image_example.dart @@ -3,10 +3,9 @@ import 'dart:io'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - // Package imports: import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; // Project imports: diff --git a/example/lib/features/preview/preview_img.dart b/example/lib/features/preview/preview_img.dart index 85c99d881..0b07a86af 100644 --- a/example/lib/features/preview/preview_img.dart +++ b/example/lib/features/preview/preview_img.dart @@ -6,9 +6,9 @@ import 'dart:ui' as ui; import 'package:bot_toast/bot_toast.dart'; import 'package:file_saver/file_saver.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:gal/gal.dart'; import 'package:intl/intl.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mime/mime.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/preview/preview_video.dart b/example/lib/features/preview/preview_video.dart index 5328ee64c..2b3c9c494 100644 --- a/example/lib/features/preview/preview_video.dart +++ b/example/lib/features/preview/preview_video.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/reorder_layer_example.dart b/example/lib/features/reorder_layer_example.dart index 8084e218e..e6da663e7 100644 --- a/example/lib/features/reorder_layer_example.dart +++ b/example/lib/features/reorder_layer_example.dart @@ -1,7 +1,7 @@ // Flutter imports: import 'package:example/core/constants/example_constants.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/round_cropper_example.dart b/example/lib/features/round_cropper_example.dart index 87369ae49..093ce3bf7 100644 --- a/example/lib/features/round_cropper_example.dart +++ b/example/lib/features/round_cropper_example.dart @@ -1,6 +1,6 @@ // Flutter imports: import 'package:example/core/constants/example_constants.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/signature_drawing_example.dart b/example/lib/features/signature_drawing_example.dart index 9f257c1b5..d67c943ed 100644 --- a/example/lib/features/signature_drawing_example.dart +++ b/example/lib/features/signature_drawing_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/standalone_example.dart b/example/lib/features/standalone_example.dart index 8101dc970..04dbfba59 100644 --- a/example/lib/features/standalone_example.dart +++ b/example/lib/features/standalone_example.dart @@ -1,6 +1,6 @@ // Flutter imports: import 'package:example/core/constants/example_constants.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/stickers_example.dart b/example/lib/features/stickers_example.dart index 456ae5971..d66d944bb 100644 --- a/example/lib/features/stickers_example.dart +++ b/example/lib/features/stickers_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/video_examples/mixins/video_editor_mixin.dart b/example/lib/features/video_examples/mixins/video_editor_mixin.dart index c7a4708d8..bc6299910 100644 --- a/example/lib/features/video_examples/mixins/video_editor_mixin.dart +++ b/example/lib/features/video_examples/mixins/video_editor_mixin.dart @@ -6,7 +6,7 @@ import 'package:example/features/preview/preview_video.dart'; import 'package:example/shared/widgets/video_progress_alert.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:path_provider/path_provider.dart'; import 'package:pro_image_editor/core/platform/io/io_helper.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/features/video_examples/pages/chewie_player_example.dart b/example/lib/features/video_examples/pages/chewie_player_example.dart index 22da9f860..a3322fb43 100644 --- a/example/lib/features/video_examples/pages/chewie_player_example.dart +++ b/example/lib/features/video_examples/pages/chewie_player_example.dart @@ -1,5 +1,5 @@ import 'package:chewie/chewie.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_video_editor/pro_video_editor.dart'; import 'package:video_player/video_player.dart'; diff --git a/example/lib/features/video_examples/pages/flick_video_player_example.dart b/example/lib/features/video_examples/pages/flick_video_player_example.dart index 20ad559d9..1c33d8155 100644 --- a/example/lib/features/video_examples/pages/flick_video_player_example.dart +++ b/example/lib/features/video_examples/pages/flick_video_player_example.dart @@ -1,5 +1,5 @@ import 'package:flick_video_player/flick_video_player.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_video_editor/pro_video_editor.dart'; import 'package:video_player/video_player.dart'; diff --git a/example/lib/features/video_examples/pages/video_media_kit_example.dart b/example/lib/features/video_examples/pages/video_media_kit_example.dart index d49e20f78..ee4f96d55 100644 --- a/example/lib/features/video_examples/pages/video_media_kit_example.dart +++ b/example/lib/features/video_examples/pages/video_media_kit_example.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/example/lib/features/video_examples/pages/video_player_example.dart b/example/lib/features/video_examples/pages/video_player_example.dart index c96a8ab83..9fd35a007 100644 --- a/example/lib/features/video_examples/pages/video_player_example.dart +++ b/example/lib/features/video_examples/pages/video_player_example.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:example/core/constants/example_constants.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:video_player/video_player.dart'; diff --git a/example/lib/features/video_examples/video_example.dart b/example/lib/features/video_examples/video_example.dart index 504720090..154ce9e52 100644 --- a/example/lib/features/video_examples/video_example.dart +++ b/example/lib/features/video_examples/video_example.dart @@ -1,6 +1,6 @@ import 'package:example/shared/widgets/paragraph_info_widget.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/platform/io/io_helper.dart'; import '/core/mixin/example_helper.dart'; diff --git a/example/lib/features/video_examples/widgets/video_initializing_widget.dart b/example/lib/features/video_examples/widgets/video_initializing_widget.dart index 5a929d058..6c35b326b 100644 --- a/example/lib/features/video_examples/widgets/video_initializing_widget.dart +++ b/example/lib/features/video_examples/widgets/video_initializing_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that displays a initializing screen when the video editor startup. class VideoInitializingWidget extends StatelessWidget { diff --git a/example/lib/features/zoom_example.dart b/example/lib/features/zoom_example.dart index fbbd65981..8c510cae8 100644 --- a/example/lib/features/zoom_example.dart +++ b/example/lib/features/zoom_example.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Package imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/lib/main.dart b/example/lib/main.dart index ecd3eb527..b6b8e5240 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,10 +1,9 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:example/shared/widgets/not_found_example.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:media_kit/media_kit.dart'; - import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/example/lib/shared/widgets/demo_build_stickers.dart b/example/lib/shared/widgets/demo_build_stickers.dart index c0ff0b2b1..ae4cf397d 100644 --- a/example/lib/shared/widgets/demo_build_stickers.dart +++ b/example/lib/shared/widgets/demo_build_stickers.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; /// A widget that demonstrates the building of sticker categories and displays diff --git a/example/lib/shared/widgets/material_icon_button.dart b/example/lib/shared/widgets/material_icon_button.dart index 2a0cfb2fc..dfb276c45 100644 --- a/example/lib/shared/widgets/material_icon_button.dart +++ b/example/lib/shared/widgets/material_icon_button.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A stateless widget that displays a material-styled icon button with a custom /// circular background, half of which is a secondary color. Below the icon, diff --git a/example/lib/shared/widgets/not_found_example.dart b/example/lib/shared/widgets/not_found_example.dart index 6d0c80968..adbdfa9b1 100644 --- a/example/lib/shared/widgets/not_found_example.dart +++ b/example/lib/shared/widgets/not_found_example.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that displays a centered "Example not found" message. /// diff --git a/example/lib/shared/widgets/prepare_image_widget.dart b/example/lib/shared/widgets/prepare_image_widget.dart index b82e1ee8c..cdf1eddaf 100644 --- a/example/lib/shared/widgets/prepare_image_widget.dart +++ b/example/lib/shared/widgets/prepare_image_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that displays a loading screen with a progress indicator and a /// message. diff --git a/example/lib/shared/widgets/video_progress_alert.dart b/example/lib/shared/widgets/video_progress_alert.dart index b2e53217d..d95286389 100644 --- a/example/lib/shared/widgets/video_progress_alert.dart +++ b/example/lib/shared/widgets/video_progress_alert.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_video_editor/pro_video_editor.dart'; diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 11da86f12..4fb8db411 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -15,6 +15,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni onnxruntime ) diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index e56b69199..90a8acb8b 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -42,7 +42,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { ProVideoEditorPlugin.register(with: registry.registrar(forPlugin: "ProVideoEditorPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) - FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin")) + VideoPlayerPlugin.register(with: registry.registrar(forPlugin: "VideoPlayerPlugin")) VolumeControllerPlugin.register(with: registry.registrar(forPlugin: "VolumeControllerPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) } diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 79ca44c48..338d4358f 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -45,6 +45,8 @@ dependencies: media_kit_video: ^1.3.0 # For video rendering. media_kit_libs_video: ^1.0.6 # Native video dependencies. + material_ui: any + cupertino_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index ec34a8b70..71c4bd2c3 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -18,6 +18,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni onnxruntime ) diff --git a/lib/core/mixins/editor_callbacks_mixin.dart b/lib/core/mixins/editor_callbacks_mixin.dart index a80546f76..f59adffc0 100644 --- a/lib/core/mixins/editor_callbacks_mixin.dart +++ b/lib/core/mixins/editor_callbacks_mixin.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../enums/editor_mode.dart'; import '../models/editor_callbacks/pro_image_editor_callbacks.dart'; diff --git a/lib/core/mixins/editor_configs_mixin.dart b/lib/core/mixins/editor_configs_mixin.dart index 501f586f3..7b9696cb3 100644 --- a/lib/core/mixins/editor_configs_mixin.dart +++ b/lib/core/mixins/editor_configs_mixin.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../models/editor_callbacks/pro_image_editor_callbacks.dart'; import '../models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/core/mixins/standalone_editor.dart b/lib/core/mixins/standalone_editor.dart index e2b56da8d..c0cf082bd 100644 --- a/lib/core/mixins/standalone_editor.dart +++ b/lib/core/mixins/standalone_editor.dart @@ -1,8 +1,8 @@ // Dart imports: import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_callbacks.dart'; import '/core/models/complete_parameters.dart'; diff --git a/lib/core/models/editor_configs/crop_rotate_editor_configs.dart b/lib/core/models/editor_configs/crop_rotate_editor_configs.dart index 6d5bdfebc..f49dd9f36 100644 --- a/lib/core/models/editor_configs/crop_rotate_editor_configs.dart +++ b/lib/core/models/editor_configs/crop_rotate_editor_configs.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/crop_rotate_editor/enums/crop_mode.enum.dart'; import '/features/crop_rotate_editor/enums/crop_tool_enum.dart'; diff --git a/lib/core/models/editor_configs/pro_image_editor_configs.dart b/lib/core/models/editor_configs/pro_image_editor_configs.dart index 1b2be28fb..675f3f095 100644 --- a/lib/core/models/editor_configs/pro_image_editor_configs.dart +++ b/lib/core/models/editor_configs/pro_image_editor_configs.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/editor_various_constants.dart'; // Project imports: diff --git a/lib/core/models/editor_configs/text_editor_configs.dart b/lib/core/models/editor_configs/text_editor_configs.dart index 77b15f67f..1805a1237 100644 --- a/lib/core/models/editor_configs/text_editor_configs.dart +++ b/lib/core/models/editor_configs/text_editor_configs.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '../custom_widgets/text_editor_widgets.dart'; diff --git a/lib/core/models/editor_image.dart b/lib/core/models/editor_image.dart index e9b45d9ea..53207ed2c 100644 --- a/lib/core/models/editor_image.dart +++ b/lib/core/models/editor_image.dart @@ -1,6 +1,6 @@ // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/platform/io/io_helper.dart'; import '/shared/utils/converters.dart'; diff --git a/lib/core/models/icons/audio_editor_icons.dart b/lib/core/models/icons/audio_editor_icons.dart index c6cfb6dbd..d4d310f08 100644 --- a/lib/core/models/icons/audio_editor_icons.dart +++ b/lib/core/models/icons/audio_editor_icons.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Defines icon configurations for the audio editor. class AudioEditorIcons { diff --git a/lib/core/models/icons/blur_editor_icons.dart b/lib/core/models/icons/blur_editor_icons.dart index 0d9117cce..a1d4af9bd 100644 --- a/lib/core/models/icons/blur_editor_icons.dart +++ b/lib/core/models/icons/blur_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Blur Editor component. class BlurEditorIcons { diff --git a/lib/core/models/icons/clips_editor_icons.dart b/lib/core/models/icons/clips_editor_icons.dart index 2daa85af4..d36f3a445 100644 --- a/lib/core/models/icons/clips_editor_icons.dart +++ b/lib/core/models/icons/clips_editor_icons.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Defines icon configurations for the Video Clips editor. class ClipsEditorIcons { diff --git a/lib/core/models/icons/crop_rotate_editor_icons.dart b/lib/core/models/icons/crop_rotate_editor_icons.dart index f9342017f..e42775551 100644 --- a/lib/core/models/icons/crop_rotate_editor_icons.dart +++ b/lib/core/models/icons/crop_rotate_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Crop/Rotate Editor component. class CropRotateEditorIcons { diff --git a/lib/core/models/icons/emoji_editor_icons.dart b/lib/core/models/icons/emoji_editor_icons.dart index 68d8d5974..1d9bd35e9 100644 --- a/lib/core/models/icons/emoji_editor_icons.dart +++ b/lib/core/models/icons/emoji_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Emoji Editor component. class EmojiEditorIcons { diff --git a/lib/core/models/icons/filter_editor_icons.dart b/lib/core/models/icons/filter_editor_icons.dart index 088c7920c..c683cbf3a 100644 --- a/lib/core/models/icons/filter_editor_icons.dart +++ b/lib/core/models/icons/filter_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Filter Editor component. class FilterEditorIcons { diff --git a/lib/core/models/icons/layer_interaction_icons.dart b/lib/core/models/icons/layer_interaction_icons.dart index 53dbfde51..4e0dee89b 100644 --- a/lib/core/models/icons/layer_interaction_icons.dart +++ b/lib/core/models/icons/layer_interaction_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Represents the interaction icons for layers in the theme. /// diff --git a/lib/core/models/icons/main_editor_icons.dart b/lib/core/models/icons/main_editor_icons.dart index 9007bda9c..f4af57a33 100644 --- a/lib/core/models/icons/main_editor_icons.dart +++ b/lib/core/models/icons/main_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for Main-Editor component. class MainEditorIcons { diff --git a/lib/core/models/icons/paint_editor_icons.dart b/lib/core/models/icons/paint_editor_icons.dart index bb814c8a3..1802bdd80 100644 --- a/lib/core/models/icons/paint_editor_icons.dart +++ b/lib/core/models/icons/paint_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Paint Editor component. class PaintEditorIcons { diff --git a/lib/core/models/icons/sticker_editor_icons.dart b/lib/core/models/icons/sticker_editor_icons.dart index 39c8fd9bf..87ea5c291 100644 --- a/lib/core/models/icons/sticker_editor_icons.dart +++ b/lib/core/models/icons/sticker_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/ui/pro_image_editor_icons.dart'; diff --git a/lib/core/models/icons/text_editor_icons.dart b/lib/core/models/icons/text_editor_icons.dart index fa773011f..5728762cf 100644 --- a/lib/core/models/icons/text_editor_icons.dart +++ b/lib/core/models/icons/text_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Customizable icons for the Text Editor component. class TextEditorIcons { diff --git a/lib/core/models/icons/tune_editor_icons.dart b/lib/core/models/icons/tune_editor_icons.dart index 9630f7cb9..f33f968fa 100644 --- a/lib/core/models/icons/tune_editor_icons.dart +++ b/lib/core/models/icons/tune_editor_icons.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A configuration class for defining icons used in the Tune Editor. /// diff --git a/lib/core/models/icons/video_editor_icons.dart b/lib/core/models/icons/video_editor_icons.dart index 5358fcfa8..90ae80e4e 100644 --- a/lib/core/models/icons/video_editor_icons.dart +++ b/lib/core/models/icons/video_editor_icons.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Defines icon configurations for the video editor. class VideoEditorIcons { diff --git a/lib/core/models/init_configs/editor_init_configs.dart b/lib/core/models/init_configs/editor_init_configs.dart index d024aef92..e9fe8c0ae 100644 --- a/lib/core/models/init_configs/editor_init_configs.dart +++ b/lib/core/models/init_configs/editor_init_configs.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/filter_editor/types/filter_matrix.dart'; import '/features/tune_editor/models/tune_adjustment_matrix.dart'; diff --git a/lib/core/models/layers/layer.dart b/lib/core/models/layers/layer.dart index f33fcae40..64945a05e 100644 --- a/lib/core/models/layers/layer.dart +++ b/lib/core/models/layers/layer.dart @@ -4,8 +4,8 @@ import 'dart:ui' as ui; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/int_constants.dart'; import '/core/models/editor_configs/image_generation_configs/image_generation_configs.dart'; diff --git a/lib/core/models/styles/layer_interaction_style.dart b/lib/core/models/styles/layer_interaction_style.dart index ac9b7b4f6..5d1e08807 100644 --- a/lib/core/models/styles/layer_interaction_style.dart +++ b/lib/core/models/styles/layer_interaction_style.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// Represents the interaction settings for layers in the style. /// diff --git a/lib/core/models/styles/text_editor_style.dart b/lib/core/models/styles/text_editor_style.dart index 4a57c3c21..fb9a4c52d 100644 --- a/lib/core/models/styles/text_editor_style.dart +++ b/lib/core/models/styles/text_editor_style.dart @@ -1,7 +1,7 @@ // Flutter imports: import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../../constants/editor_style_constants.dart'; diff --git a/lib/core/models/styles/video_editor_style.dart b/lib/core/models/styles/video_editor_style.dart index 3bd31541e..9b7836951 100644 --- a/lib/core/models/styles/video_editor_style.dart +++ b/lib/core/models/styles/video_editor_style.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; /// Defines style configurations for the video editor. class VideoEditorStyle { diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_appbar.dart index 194f9ac27..26baa1b14 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import '../../frosted_glass.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_audio_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_audio_appbar.dart index 66533c6c7..62b4f8640 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_audio_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_audio_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/audio_editor/audio_editor_page.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_blur_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_blur_appbar.dart index 6ec29b5a2..df6243d53 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_blur_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_blur_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/blur_editor/blur_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clip_edit_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clip_edit_appbar.dart index 5673bb452..f50883864 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clip_edit_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clip_edit_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/clips_editor/pages/clips_editor_edit_page.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clips_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clips_appbar.dart index 1f1c43681..f176cfbb5 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clips_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_clips_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/clips_editor/pages/clips_editor_page.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_filter_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_filter_appbar.dart index 29d81bb77..e049aa767 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_filter_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_filter_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '../../../../pro_image_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_paint_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_paint_appbar.dart index c1b9116fc..2f7b6892e 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_paint_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_paint_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '../../../../pro_image_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_text_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_text_appbar.dart index 9cddacfd2..34fb3fabb 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_text_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_text_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/text_editor/text_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_tune_appbar.dart b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_tune_appbar.dart index 4fd1efd67..355bd1cbc 100644 --- a/lib/designs/frosted_glass/widgets/appbar/frosted_glass_tune_appbar.dart +++ b/lib/designs/frosted_glass/widgets/appbar/frosted_glass_tune_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/tune_editor/tune_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_paint_bottombar.dart b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_paint_bottombar.dart index 398028e9e..2fe1fc216 100644 --- a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_paint_bottombar.dart +++ b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_paint_bottombar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/ui/pro_image_editor_icons.dart'; import '/designs/frosted_glass/frosted_glass.dart'; diff --git a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_text_bottombar.dart b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_text_bottombar.dart index f906c72d9..aa747f4e1 100644 --- a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_text_bottombar.dart +++ b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_text_bottombar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/features/text_editor/widgets/text_editor_bottom_bar.dart'; diff --git a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_tune_bottombar.dart b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_tune_bottombar.dart index 2299f52bc..7407b62af 100644 --- a/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_tune_bottombar.dart +++ b/lib/designs/frosted_glass/widgets/bottombar/frosted_glass_tune_bottombar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/editor_style_constants.dart'; import '/features/tune_editor/tune_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_close_dialog.dart b/lib/designs/frosted_glass/widgets/frosted_glass_close_dialog.dart index d9decc404..64ce1e316 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_close_dialog.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_close_dialog.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/pro_image_editor.dart'; diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_crop_rotate_toolbar.dart b/lib/designs/frosted_glass/widgets/frosted_glass_crop_rotate_toolbar.dart index e9f8b18ca..5f3bf2277 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_crop_rotate_toolbar.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_crop_rotate_toolbar.dart @@ -1,6 +1,6 @@ // Flutter imports: -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 '/pro_image_editor.dart'; import '../frosted_glass.dart'; diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_effect.dart b/lib/designs/frosted_glass/widgets/frosted_glass_effect.dart index 0408afb1d..49861a702 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_effect.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_effect.dart @@ -2,7 +2,7 @@ import 'dart:ui'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A stateless widget that applies a frosted glass effect to its child widget. /// diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_loading_dialog.dart b/lib/designs/frosted_glass/widgets/frosted_glass_loading_dialog.dart index 4bc1709d4..a22f6d3f3 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_loading_dialog.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_loading_dialog.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import 'frosted_glass_effect.dart'; diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_sticker_editor.dart b/lib/designs/frosted_glass/widgets/frosted_glass_sticker_editor.dart index 947d050b3..162f4484a 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_sticker_editor.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_sticker_editor.dart @@ -1,5 +1,5 @@ -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 '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/designs/frosted_glass/widgets/frosted_glass_text_size_slider.dart b/lib/designs/frosted_glass/widgets/frosted_glass_text_size_slider.dart index 009282bd6..85953ba41 100644 --- a/lib/designs/frosted_glass/widgets/frosted_glass_text_size_slider.dart +++ b/lib/designs/frosted_glass/widgets/frosted_glass_text_size_slider.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; diff --git a/lib/designs/grounded/widgets/bottombar/grounded_audio_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_audio_bar.dart index aef6584cb..4332d26ab 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_audio_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_audio_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/designs/grounded/widgets/bottombar/grounded_blur_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_blur_bar.dart index c71c525b5..1672ff771 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_blur_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_blur_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -61,9 +61,7 @@ class _GroundedBlurBarState extends State child: FadeInUp( duration: kGroundedFadeInDuration, child: Slider( - onChanged: (value) { - widget.editor.setBlurFactor(value); - }, + onChanged: widget.editor.setBlurFactor, value: widget.editor.blurFactor, max: blurEditorConfigs.maxBlur, activeColor: Colors.blue.shade200, diff --git a/lib/designs/grounded/widgets/bottombar/grounded_bottom_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_bottom_bar.dart index f2637da13..bea46e9b1 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_bottom_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_bottom_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; /// A widget that represents the bottom action bar in the image editor. diff --git a/lib/designs/grounded/widgets/bottombar/grounded_clip_edit_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_clip_edit_bar.dart index 1772b6da8..f0fe73b5e 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_clip_edit_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_clip_edit_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/designs/grounded/widgets/bottombar/grounded_clips_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_clips_bar.dart index c1218c859..453389814 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_clips_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_clips_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/designs/grounded/widgets/bottombar/grounded_crop_rotate_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_crop_rotate_bar.dart index a6ec9d8cb..c3c1fd581 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_crop_rotate_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_crop_rotate_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -169,9 +169,7 @@ class _GroundedCropRotateBarState extends State cropRotateEditorConfigs.icons.rotate, color: _foreGroundColor, ), - onPressed: () { - widget.editor.rotate(); - }, + onPressed: widget.editor.rotate, ), FlatIconTextButton( label: Text( @@ -179,9 +177,7 @@ class _GroundedCropRotateBarState extends State style: TextStyle(fontSize: 10.0, color: _foreGroundColorAccent), ), icon: Icon(cropRotateEditorConfigs.icons.flip, color: _foreGroundColor), - onPressed: () { - widget.editor.flip(); - }, + onPressed: widget.editor.flip, ), ]; } diff --git a/lib/designs/grounded/widgets/bottombar/grounded_filter_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_filter_bar.dart index 698d69887..8836c7fef 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_filter_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_filter_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -133,9 +133,7 @@ class _GroundedFilterBarState extends State configs: configs, transformConfigs: widget.editor.initialTransformConfigs, selectedFilter: widget.editor.selectedFilter.filters, - onSelectFilter: (filter) { - widget.editor.setFilter(filter); - }, + onSelectFilter: widget.editor.setFilter, ), ), ], diff --git a/lib/designs/grounded/widgets/bottombar/grounded_main_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_main_bar.dart index 55f3172c0..608185ff6 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_main_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_main_bar.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/designs/grounded/widgets/bottombar/grounded_paint_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_paint_bar.dart index 18ca15927..4f41fca32 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_paint_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_paint_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -190,9 +190,7 @@ class _GroundedPaintBarState extends State paintEditorConfigs.icons.lineWeight, color: _foreGroundColor, ), - onPressed: () { - widget.editor.openLinWidthBottomSheet(); - }, + onPressed: widget.editor.openLinWidthBottomSheet, ), FlatIconTextButton( label: Text( @@ -203,9 +201,7 @@ class _GroundedPaintBarState extends State paintEditorConfigs.icons.changeOpacity, color: _foreGroundColor, ), - onPressed: () { - widget.editor.openOpacityBottomSheet(); - }, + onPressed: widget.editor.openOpacityBottomSheet, ), AnimatedSwitcher( duration: const Duration(milliseconds: 220), @@ -236,9 +232,7 @@ class _GroundedPaintBarState extends State : paintEditorConfigs.icons.noFill, color: _foreGroundColor, ), - onPressed: () { - widget.editor.toggleFill(); - }, + onPressed: widget.editor.toggleFill, ), ) : const SizedBox.shrink(), diff --git a/lib/designs/grounded/widgets/bottombar/grounded_text_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_text_bar.dart index dc64b48d8..9c97e7ebc 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_text_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_text_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -168,9 +168,7 @@ class _GroundedTextBarState extends State TextAlign.right => textEditorConfigs.icons.alignRight, TextAlign.center || _ => textEditorConfigs.icons.alignCenter, }, color: _foreGroundColor), - onPressed: () { - widget.editor.toggleTextAlign(); - }, + onPressed: widget.editor.toggleTextAlign, ), FlatIconTextButton( label: Text( @@ -181,9 +179,7 @@ class _GroundedTextBarState extends State textEditorConfigs.icons.backgroundMode, color: _foreGroundColor, ), - onPressed: () { - widget.editor.toggleBackgroundMode(); - }, + onPressed: widget.editor.toggleBackgroundMode, ), ]; } diff --git a/lib/designs/grounded/widgets/bottombar/grounded_tune_bar.dart b/lib/designs/grounded/widgets/bottombar/grounded_tune_bar.dart index 47c76451e..d5c60b5fa 100644 --- a/lib/designs/grounded/widgets/bottombar/grounded_tune_bar.dart +++ b/lib/designs/grounded/widgets/bottombar/grounded_tune_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/designs/grounded/widgets/grounded_bottom_wrapper.dart b/lib/designs/grounded/widgets/grounded_bottom_wrapper.dart index 59f470a43..876cebe28 100644 --- a/lib/designs/grounded/widgets/grounded_bottom_wrapper.dart +++ b/lib/designs/grounded/widgets/grounded_bottom_wrapper.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A wrapper widget that provides a themed layout for bottom UI components. /// diff --git a/lib/designs/grounded/widgets/grounded_emoji_editor.dart b/lib/designs/grounded/widgets/grounded_emoji_editor.dart index b39576fb6..cd183bf51 100644 --- a/lib/designs/grounded/widgets/grounded_emoji_editor.dart +++ b/lib/designs/grounded/widgets/grounded_emoji_editor.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; diff --git a/lib/designs/grounded/widgets/grounded_loading_dialog.dart b/lib/designs/grounded/widgets/grounded_loading_dialog.dart index fb92f1967..71ccecfa1 100644 --- a/lib/designs/grounded/widgets/grounded_loading_dialog.dart +++ b/lib/designs/grounded/widgets/grounded_loading_dialog.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import '../../frosted_glass/widgets/frosted_glass_effect.dart'; diff --git a/lib/designs/grounded/widgets/grounded_sticker_editor.dart b/lib/designs/grounded/widgets/grounded_sticker_editor.dart index d7a43d75d..7345ad3f0 100644 --- a/lib/designs/grounded/widgets/grounded_sticker_editor.dart +++ b/lib/designs/grounded/widgets/grounded_sticker_editor.dart @@ -1,6 +1,6 @@ // Flutter imports: -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 '/pro_image_editor.dart'; import '../../frosted_glass/frosted_glass.dart'; diff --git a/lib/designs/grounded/widgets/grounded_text_size_slider.dart b/lib/designs/grounded/widgets/grounded_text_size_slider.dart index b1ff4aa29..855e1c0d7 100644 --- a/lib/designs/grounded/widgets/grounded_text_size_slider.dart +++ b/lib/designs/grounded/widgets/grounded_text_size_slider.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import '/shared/widgets/animated/fade_in_left.dart'; diff --git a/lib/designs/layer_selection/float_select/painter/float_select_border_painter.dart b/lib/designs/layer_selection/float_select/painter/float_select_border_painter.dart index 715c7f7d2..51093d685 100644 --- a/lib/designs/layer_selection/float_select/painter/float_select_border_painter.dart +++ b/lib/designs/layer_selection/float_select/painter/float_select_border_painter.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Paints a custom rectangular border for FloatSelect class FloatSelectBorderPainter extends CustomPainter { diff --git a/lib/designs/layer_selection/float_select/utils/float_select_transparent_hit_test.dart b/lib/designs/layer_selection/float_select/utils/float_select_transparent_hit_test.dart index 3157bd19d..6190b8bb2 100644 --- a/lib/designs/layer_selection/float_select/utils/float_select_transparent_hit_test.dart +++ b/lib/designs/layer_selection/float_select/utils/float_select_transparent_hit_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that ignores all pointer events class HitTestTransparent extends SingleChildRenderObjectWidget { diff --git a/lib/designs/layer_selection/float_select/widgets/float_select_resize_handler.dart b/lib/designs/layer_selection/float_select/widgets/float_select_resize_handler.dart index a30aa7312..22eaa5bf8 100644 --- a/lib/designs/layer_selection/float_select/widgets/float_select_resize_handler.dart +++ b/lib/designs/layer_selection/float_select/widgets/float_select_resize_handler.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/custom_widgets/layer_interaction_widgets.dart'; import '../utils/float_select_transparent_hit_test.dart'; diff --git a/lib/designs/layer_selection/float_select/widgets/float_select_toolbar.dart b/lib/designs/layer_selection/float_select/widgets/float_select_toolbar.dart index cc3f048d8..827e1c5b6 100644 --- a/lib/designs/layer_selection/float_select/widgets/float_select_toolbar.dart +++ b/lib/designs/layer_selection/float_select/widgets/float_select_toolbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/custom_widgets/layer_interaction_widgets.dart'; import '/core/models/layers/layer.dart'; diff --git a/lib/designs/layer_selection/float_select/widgets/float_select_toolbar_button.dart b/lib/designs/layer_selection/float_select/widgets/float_select_toolbar_button.dart index e91692adf..db84dcf5f 100644 --- a/lib/designs/layer_selection/float_select/widgets/float_select_toolbar_button.dart +++ b/lib/designs/layer_selection/float_select/widgets/float_select_toolbar_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A styled text button used in the FloatSelect toolbar class FloatSelectToolbarButton extends StatelessWidget { diff --git a/lib/designs/layer_selection/float_select/widgets/float_selection_overlay.dart b/lib/designs/layer_selection/float_select/widgets/float_selection_overlay.dart index 448e38192..93f002341 100644 --- a/lib/designs/layer_selection/float_select/widgets/float_selection_overlay.dart +++ b/lib/designs/layer_selection/float_select/widgets/float_selection_overlay.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/custom_widgets/layer_interaction_widgets.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/designs/whatsapp/styles/whatsapp_appbar_button_style.dart b/lib/designs/whatsapp/styles/whatsapp_appbar_button_style.dart index cf742afb4..99b9e04cf 100644 --- a/lib/designs/whatsapp/styles/whatsapp_appbar_button_style.dart +++ b/lib/designs/whatsapp/styles/whatsapp_appbar_button_style.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Represents the button style for WhatsApp-themed buttons. /// diff --git a/lib/designs/whatsapp/whatsapp_color_picker.dart b/lib/designs/whatsapp/whatsapp_color_picker.dart index ccd63294c..5064537d1 100644 --- a/lib/designs/whatsapp/whatsapp_color_picker.dart +++ b/lib/designs/whatsapp/whatsapp_color_picker.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A stateful widget that provides a color picker inspired by WhatsApp. /// diff --git a/lib/designs/whatsapp/whatsapp_crop_rotate_toolbar.dart b/lib/designs/whatsapp/whatsapp_crop_rotate_toolbar.dart index 1fc9747a4..e9d2c2162 100644 --- a/lib/designs/whatsapp/whatsapp_crop_rotate_toolbar.dart +++ b/lib/designs/whatsapp/whatsapp_crop_rotate_toolbar.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/whatsapp_done_btn.dart b/lib/designs/whatsapp/whatsapp_done_btn.dart index 58c3bb6bd..b6ba471e6 100644 --- a/lib/designs/whatsapp/whatsapp_done_btn.dart +++ b/lib/designs/whatsapp/whatsapp_done_btn.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/designs/whatsapp/whatsapp_paint_colorpicker.dart b/lib/designs/whatsapp/whatsapp_paint_colorpicker.dart index aadb1ff01..db70e6274 100644 --- a/lib/designs/whatsapp/whatsapp_paint_colorpicker.dart +++ b/lib/designs/whatsapp/whatsapp_paint_colorpicker.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/enums/design_mode.dart'; import '/features/paint_editor/paint_editor.dart'; diff --git a/lib/designs/whatsapp/whatsapp_sticker_editor.dart b/lib/designs/whatsapp/whatsapp_sticker_editor.dart index 67fc76028..792ad411c 100644 --- a/lib/designs/whatsapp/whatsapp_sticker_editor.dart +++ b/lib/designs/whatsapp/whatsapp_sticker_editor.dart @@ -1,8 +1,8 @@ import 'dart:ui'; // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; diff --git a/lib/designs/whatsapp/whatsapp_text_colorpicker.dart b/lib/designs/whatsapp/whatsapp_text_colorpicker.dart index 5d04fd048..24a1e5a44 100644 --- a/lib/designs/whatsapp/whatsapp_text_colorpicker.dart +++ b/lib/designs/whatsapp/whatsapp_text_colorpicker.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/whatsapp_text_size_slider.dart b/lib/designs/whatsapp/whatsapp_text_size_slider.dart index 6e3ed999b..73c0e1e4e 100644 --- a/lib/designs/whatsapp/whatsapp_text_size_slider.dart +++ b/lib/designs/whatsapp/whatsapp_text_size_slider.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/widgets/appbar/whatsapp_appbar.dart b/lib/designs/whatsapp/widgets/appbar/whatsapp_appbar.dart index 8e9203079..17fcdf6b3 100644 --- a/lib/designs/whatsapp/widgets/appbar/whatsapp_appbar.dart +++ b/lib/designs/whatsapp/widgets/appbar/whatsapp_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/gesture/gesture_interceptor_widget.dart'; diff --git a/lib/designs/whatsapp/widgets/appbar/whatsapp_paint_appbar.dart b/lib/designs/whatsapp/widgets/appbar/whatsapp_paint_appbar.dart index 98d8fe516..3a8867789 100644 --- a/lib/designs/whatsapp/widgets/appbar/whatsapp_paint_appbar.dart +++ b/lib/designs/whatsapp/widgets/appbar/whatsapp_paint_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/widgets/appbar/whatsapp_text_appbar.dart b/lib/designs/whatsapp/widgets/appbar/whatsapp_text_appbar.dart index 9681862f0..0a0368ef4 100644 --- a/lib/designs/whatsapp/widgets/appbar/whatsapp_text_appbar.dart +++ b/lib/designs/whatsapp/widgets/appbar/whatsapp_text_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/widgets/bottombar/whatsapp_paint_bottombar.dart b/lib/designs/whatsapp/widgets/bottombar/whatsapp_paint_bottombar.dart index c415d7d54..8518aa161 100644 --- a/lib/designs/whatsapp/widgets/bottombar/whatsapp_paint_bottombar.dart +++ b/lib/designs/whatsapp/widgets/bottombar/whatsapp_paint_bottombar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/ui/pro_image_editor_icons.dart'; import '/designs/whatsapp/whatsapp_color_picker.dart'; diff --git a/lib/designs/whatsapp/widgets/bottombar/whatsapp_text_bottombar.dart b/lib/designs/whatsapp/widgets/bottombar/whatsapp_text_bottombar.dart index 714e19646..f2140c3ef 100644 --- a/lib/designs/whatsapp/widgets/bottombar/whatsapp_text_bottombar.dart +++ b/lib/designs/whatsapp/widgets/bottombar/whatsapp_text_bottombar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/text_editor/widgets/text_editor_bottom_bar.dart'; import '/pro_image_editor.dart'; diff --git a/lib/designs/whatsapp/widgets/filter/whatsapp_filter_button.dart b/lib/designs/whatsapp/widgets/filter/whatsapp_filter_button.dart index 53e47f3f1..0b712ca31 100644 --- a/lib/designs/whatsapp/widgets/filter/whatsapp_filter_button.dart +++ b/lib/designs/whatsapp/widgets/filter/whatsapp_filter_button.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/features/filter_editor/utils/filter_generator/filter_model.dart'; diff --git a/lib/designs/whatsapp/widgets/filter/whatsapp_filters.dart b/lib/designs/whatsapp/widgets/filter/whatsapp_filters.dart index e313cbd55..4625d0d39 100644 --- a/lib/designs/whatsapp/widgets/filter/whatsapp_filters.dart +++ b/lib/designs/whatsapp/widgets/filter/whatsapp_filters.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import '../../whatsapp.dart'; diff --git a/lib/designs/whatsapp/widgets/filter/whatsapp_open_filter_button.dart b/lib/designs/whatsapp/widgets/filter/whatsapp_open_filter_button.dart index 20e27f49c..798c9beec 100644 --- a/lib/designs/whatsapp/widgets/filter/whatsapp_open_filter_button.dart +++ b/lib/designs/whatsapp/widgets/filter/whatsapp_open_filter_button.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/audio_editor/audio_editor_page.dart b/lib/features/audio_editor/audio_editor_page.dart index 0ac8e13b0..053d6e4b2 100644 --- a/lib/features/audio_editor/audio_editor_page.dart +++ b/lib/features/audio_editor/audio_editor_page.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:ui'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -42,7 +42,7 @@ class AudioEditorPage extends StatefulWidget with SimpleConfigsAccess { final AudioTrack? initialSelectedTrack; @override - createState() => AudioEditorPageState(); + AudioEditorPageState createState() => AudioEditorPageState(); } /// State responsible for rendering and managing the audio editor page. diff --git a/lib/features/audio_editor/widgets/audio_editor_app_bar.dart b/lib/features/audio_editor/widgets/audio_editor_app_bar.dart index 6c6085209..2f96179bd 100644 --- a/lib/features/audio_editor/widgets/audio_editor_app_bar.dart +++ b/lib/features/audio_editor/widgets/audio_editor_app_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/audio_editor/widgets/audio_main_bottom_bar.dart b/lib/features/audio_editor/widgets/audio_main_bottom_bar.dart index 541e95ea7..4c26fb060 100644 --- a/lib/features/audio_editor/widgets/audio_main_bottom_bar.dart +++ b/lib/features/audio_editor/widgets/audio_main_bottom_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/audio_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/audio_editor/widgets/audio_track_list_tile.dart b/lib/features/audio_editor/widgets/audio_track_list_tile.dart index fc5e62299..88fd717bd 100644 --- a/lib/features/audio_editor/widgets/audio_track_list_tile.dart +++ b/lib/features/audio_editor/widgets/audio_track_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/auto_image.dart'; diff --git a/lib/features/blur_editor/blur_editor.dart b/lib/features/blur_editor/blur_editor.dart index 26b231377..4c992bf82 100644 --- a/lib/features/blur_editor/blur_editor.dart +++ b/lib/features/blur_editor/blur_editor.dart @@ -3,8 +3,8 @@ import 'dart:async'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_callbacks.dart'; import '/core/mixins/converted_configs.dart'; @@ -156,7 +156,7 @@ class BlurEditor extends StatefulWidget final ProVideoController? videoController; @override - createState() => BlurEditorState(); + BlurEditorState createState() => BlurEditorState(); } /// The state class for the `BlurEditor` widget. diff --git a/lib/features/blur_editor/widgets/blur_editor_appbar.dart b/lib/features/blur_editor/widgets/blur_editor_appbar.dart index 22fc3cbd6..57a0b633d 100644 --- a/lib/features/blur_editor/widgets/blur_editor_appbar.dart +++ b/lib/features/blur_editor/widgets/blur_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/blur_editor_configs.dart'; import '/core/models/i18n/i18n_blur_editor.dart'; diff --git a/lib/features/blur_editor/widgets/blur_editor_bottombar.dart b/lib/features/blur_editor/widgets/blur_editor_bottombar.dart index 41c6b99be..58752059b 100644 --- a/lib/features/blur_editor/widgets/blur_editor_bottombar.dart +++ b/lib/features/blur_editor/widgets/blur_editor_bottombar.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/blur_editor_configs.dart'; import '../blur_editor.dart'; diff --git a/lib/features/clips_editor/pages/clips_editor_edit_page.dart b/lib/features/clips_editor/pages/clips_editor_edit_page.dart index 8d8154da4..9c55821bb 100644 --- a/lib/features/clips_editor/pages/clips_editor_edit_page.dart +++ b/lib/features/clips_editor/pages/clips_editor_edit_page.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/features/clips_editor/pages/clips_editor_page.dart b/lib/features/clips_editor/pages/clips_editor_page.dart index 69223e687..5ae768f07 100644 --- a/lib/features/clips_editor/pages/clips_editor_page.dart +++ b/lib/features/clips_editor/pages/clips_editor_page.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:ui'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -45,7 +45,7 @@ class ClipsEditorPage extends StatefulWidget with SimpleConfigsAccess { final List? initialClips; @override - createState() => ClipsEditorPageState(); + ClipsEditorPageState createState() => ClipsEditorPageState(); } /// State responsible for rendering and managing the clips editor page. diff --git a/lib/features/clips_editor/widgets/clips_editor_app_bar.dart b/lib/features/clips_editor/widgets/clips_editor_app_bar.dart index 9ba6daa73..d52bbd6f0 100644 --- a/lib/features/clips_editor/widgets/clips_editor_app_bar.dart +++ b/lib/features/clips_editor/widgets/clips_editor_app_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/clips_editor/widgets/clips_editor_edit_app_bar.dart b/lib/features/clips_editor/widgets/clips_editor_edit_app_bar.dart index 8763329c6..c16d45950 100644 --- a/lib/features/clips_editor/widgets/clips_editor_edit_app_bar.dart +++ b/lib/features/clips_editor/widgets/clips_editor_edit_app_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/clips_editor/widgets/clips_editor_list_tile.dart b/lib/features/clips_editor/widgets/clips_editor_list_tile.dart index c91af168e..9e614ad6f 100644 --- a/lib/features/clips_editor/widgets/clips_editor_list_tile.dart +++ b/lib/features/clips_editor/widgets/clips_editor_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/crop_rotate_editor/crop_rotate_editor.dart b/lib/features/crop_rotate_editor/crop_rotate_editor.dart index d4d6f1ac2..5b5c0d623 100644 --- a/lib/features/crop_rotate_editor/crop_rotate_editor.dart +++ b/lib/features/crop_rotate_editor/crop_rotate_editor.dart @@ -3,8 +3,8 @@ import 'dart:ui'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart' hide Image; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart' hide Image; import '/core/mixins/converted_callbacks.dart'; import '/core/mixins/converted_configs.dart'; diff --git a/lib/features/crop_rotate_editor/mixins/crop_area_history.dart b/lib/features/crop_rotate_editor/mixins/crop_area_history.dart index 985e9a598..11a73d329 100644 --- a/lib/features/crop_rotate_editor/mixins/crop_area_history.dart +++ b/lib/features/crop_rotate_editor/mixins/crop_area_history.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'dart:typed_data'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/mixins/standalone_editor.dart'; diff --git a/lib/features/crop_rotate_editor/services/crop_desktop_interaction_manager.dart b/lib/features/crop_rotate_editor/services/crop_desktop_interaction_manager.dart index 75a81f589..1f2be04a5 100644 --- a/lib/features/crop_rotate_editor/services/crop_desktop_interaction_manager.dart +++ b/lib/features/crop_rotate_editor/services/crop_desktop_interaction_manager.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// A manager class responsible for handling desktop interactions in the /// crop-rotate editor. diff --git a/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_button.dart b/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_button.dart index e417d0382..00218eee6 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_button.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_button.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A custom widget representing a button with a specific aspect ratio. class AspectRatioButton extends StatelessWidget { diff --git a/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_options.dart b/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_options.dart index d8a55af1c..feef2eddf 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_options.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_aspect_ratio_options.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/crop_corner_painter.dart b/lib/features/crop_rotate_editor/widgets/crop_corner_painter.dart index 1cb3408e3..29b1e9bdf 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_corner_painter.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_corner_painter.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/styles/crop_rotate_editor_style.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/crop_editor_appbar.dart b/lib/features/crop_rotate_editor/widgets/crop_editor_appbar.dart index 677b3a71c..cf39b0100 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_editor_appbar.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../../../core/models/editor_configs/crop_rotate_editor_configs.dart'; import '../../../core/models/i18n/i18n_crop_rotate_editor.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/crop_editor_bottombar.dart b/lib/features/crop_rotate_editor/widgets/crop_editor_bottombar.dart index 74c024c1f..453559ae4 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_editor_bottombar.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_editor_bottombar.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/editor_scrollbar.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/crop_layer_painter.dart b/lib/features/crop_rotate_editor/widgets/crop_layer_painter.dart index 249ff27c6..4298a3007 100644 --- a/lib/features/crop_rotate_editor/widgets/crop_layer_painter.dart +++ b/lib/features/crop_rotate_editor/widgets/crop_layer_painter.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A custom painter for drawing the crop layer background and overlay. /// diff --git a/lib/features/crop_rotate_editor/widgets/tilt/tilt_item_row.dart b/lib/features/crop_rotate_editor/widgets/tilt/tilt_item_row.dart index 8a6301597..08ce28389 100644 --- a/lib/features/crop_rotate_editor/widgets/tilt/tilt_item_row.dart +++ b/lib/features/crop_rotate_editor/widgets/tilt/tilt_item_row.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/shared/widgets/flat_icon_text_button.dart'; import '../../enums/tilt_mode_enum.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler.dart b/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler.dart index 17951c6fa..c82a5a507 100644 --- a/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler.dart +++ b/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler.dart @@ -1,6 +1,6 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/crop_rotate_editor_configs.dart'; diff --git a/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser.dart b/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser.dart index ab2c7b6ba..7965a07fa 100644 --- a/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser.dart +++ b/lib/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; import '/shared/extensions/double_extension.dart'; import '../../enums/tilt_mode_enum.dart'; diff --git a/lib/features/emoji_editor/emoji_editor.dart b/lib/features/emoji_editor/emoji_editor.dart index c6da884db..673761d12 100644 --- a/lib/features/emoji_editor/emoji_editor.dart +++ b/lib/features/emoji_editor/emoji_editor.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flutter/foundation.dart' show defaultTargetPlatform; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -38,7 +38,7 @@ class EmojiEditor extends StatefulWidget with SimpleConfigsAccess { final ScrollController? scrollController; @override - createState() => EmojiEditorState(); + EmojiEditorState createState() => EmojiEditorState(); } /// The state class for the `EmojiEditor` widget. diff --git a/lib/features/emoji_editor/services/emoji_state_manager.dart b/lib/features/emoji_editor/services/emoji_state_manager.dart index 7c5b6be79..046d9abca 100644 --- a/lib/features/emoji_editor/services/emoji_state_manager.dart +++ b/lib/features/emoji_editor/services/emoji_state_manager.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_cell_extended.dart b/lib/features/emoji_editor/widgets/emoji_cell_extended.dart index c51f32c60..79829fff7 100644 --- a/lib/features/emoji_editor/widgets/emoji_cell_extended.dart +++ b/lib/features/emoji_editor/widgets/emoji_cell_extended.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_editor_bottom_bar.dart b/lib/features/emoji_editor/widgets/emoji_editor_bottom_bar.dart index e42e4678e..f82c7bb29 100644 --- a/lib/features/emoji_editor/widgets/emoji_editor_bottom_bar.dart +++ b/lib/features/emoji_editor/widgets/emoji_editor_bottom_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; import '../services/emoji_state_manager.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_editor_category_view.dart b/lib/features/emoji_editor/widgets/emoji_editor_category_view.dart index 99b290d63..da0b3567a 100644 --- a/lib/features/emoji_editor/widgets/emoji_editor_category_view.dart +++ b/lib/features/emoji_editor/widgets/emoji_editor_category_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; import '../widgets/emoji_editor_bottom_bar.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_editor_full_screen_search.dart b/lib/features/emoji_editor/widgets/emoji_editor_full_screen_search.dart index a545e1b4c..115314537 100644 --- a/lib/features/emoji_editor/widgets/emoji_editor_full_screen_search.dart +++ b/lib/features/emoji_editor/widgets/emoji_editor_full_screen_search.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_editor_header_search.dart b/lib/features/emoji_editor/widgets/emoji_editor_header_search.dart index c176d7250..1a1f0df26 100644 --- a/lib/features/emoji_editor/widgets/emoji_editor_header_search.dart +++ b/lib/features/emoji_editor/widgets/emoji_editor_header_search.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/editor_style_constants.dart'; import '/core/models/i18n/i18n_emoji_editor.dart'; diff --git a/lib/features/emoji_editor/widgets/emoji_picker_view.dart b/lib/features/emoji_editor/widgets/emoji_picker_view.dart index d98367708..327795ad7 100644 --- a/lib/features/emoji_editor/widgets/emoji_picker_view.dart +++ b/lib/features/emoji_editor/widgets/emoji_picker_view.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/i18n/i18n_emoji_editor.dart'; import '/core/models/styles/emoji_editor_style.dart'; diff --git a/lib/features/filter_editor/filter_editor.dart b/lib/features/filter_editor/filter_editor.dart index cf01a4118..20a5cc9e8 100644 --- a/lib/features/filter_editor/filter_editor.dart +++ b/lib/features/filter_editor/filter_editor.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/image_constants.dart'; import '/core/mixins/converted_callbacks.dart'; @@ -159,7 +159,7 @@ class FilterEditor extends StatefulWidget final ProVideoController? videoController; @override - createState() => FilterEditorState(); + FilterEditorState createState() => FilterEditorState(); } /// The state class for the `FilterEditor` widget. diff --git a/lib/features/filter_editor/widgets/filter_editor_appbar.dart b/lib/features/filter_editor/widgets/filter_editor_appbar.dart index 88533c1fa..29cf70330 100644 --- a/lib/features/filter_editor/widgets/filter_editor_appbar.dart +++ b/lib/features/filter_editor/widgets/filter_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/filter_editor_configs.dart'; import '/core/models/i18n/i18n_filter_editor.dart'; diff --git a/lib/features/filter_editor/widgets/filter_editor_item_list.dart b/lib/features/filter_editor/widgets/filter_editor_item_list.dart index 264b09cba..70e4d25d3 100644 --- a/lib/features/filter_editor/widgets/filter_editor_item_list.dart +++ b/lib/features/filter_editor/widgets/filter_editor_item_list.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/editor_image.dart'; diff --git a/lib/features/filter_editor/widgets/filtered_widget.dart b/lib/features/filter_editor/widgets/filtered_widget.dart index db42d0f4e..37da6ba17 100644 --- a/lib/features/filter_editor/widgets/filtered_widget.dart +++ b/lib/features/filter_editor/widgets/filtered_widget.dart @@ -3,7 +3,7 @@ import 'dart:ui'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/main_editor/main_editor.dart b/lib/features/main_editor/main_editor.dart index 3db314ce5..7d1296ad4 100644 --- a/lib/features/main_editor/main_editor.dart +++ b/lib/features/main_editor/main_editor.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/editor_various_constants.dart'; import '/core/constants/image_constants.dart'; diff --git a/lib/features/main_editor/services/desktop_interaction_manager.dart b/lib/features/main_editor/services/desktop_interaction_manager.dart index de1724706..9e600059d 100644 --- a/lib/features/main_editor/services/desktop_interaction_manager.dart +++ b/lib/features/main_editor/services/desktop_interaction_manager.dart @@ -3,14 +3,13 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/layers/layer.dart'; import '/core/services/keyboard_service.dart'; - import '/shared/widgets/extended/interactive_viewer/extended_interactive_viewer.dart'; /// A manager class responsible for handling desktop interactions in the image diff --git a/lib/features/main_editor/services/layer_interaction_manager.dart b/lib/features/main_editor/services/layer_interaction_manager.dart index 168de2842..6ab1cabc0 100644 --- a/lib/features/main_editor/services/layer_interaction_manager.dart +++ b/lib/features/main_editor/services/layer_interaction_manager.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_callbacks/main_editor/helper_lines/helper_lines_callbacks.dart'; diff --git a/lib/features/main_editor/services/main_editor_layers_service.dart b/lib/features/main_editor/services/main_editor_layers_service.dart index daf03ca00..24692ad3f 100644 --- a/lib/features/main_editor/services/main_editor_layers_service.dart +++ b/lib/features/main_editor/services/main_editor_layers_service.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/main_editor/services/main_editor_state_history_service.dart b/lib/features/main_editor/services/main_editor_state_history_service.dart index 02a3b13f8..d7c6c5a45 100644 --- a/lib/features/main_editor/services/main_editor_state_history_service.dart +++ b/lib/features/main_editor/services/main_editor_state_history_service.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/main_editor/main_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/main_editor/services/sizes_manager.dart b/lib/features/main_editor/services/sizes_manager.dart index 6309aab7b..c4f02adfe 100644 --- a/lib/features/main_editor/services/sizes_manager.dart +++ b/lib/features/main_editor/services/sizes_manager.dart @@ -2,7 +2,7 @@ import 'dart:math'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/history/state_history.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_appbar.dart b/lib/features/main_editor/widgets/main_editor_appbar.dart index 75f998a14..27625a8da 100644 --- a/lib/features/main_editor/widgets/main_editor_appbar.dart +++ b/lib/features/main_editor/widgets/main_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/platform/platform_circular_progress_indicator.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_background_image.dart b/lib/features/main_editor/widgets/main_editor_background_image.dart index 1c27c0b24..8040b9f3b 100644 --- a/lib/features/main_editor/widgets/main_editor_background_image.dart +++ b/lib/features/main_editor/widgets/main_editor_background_image.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/editor_image.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_background_video.dart b/lib/features/main_editor/widgets/main_editor_background_video.dart index 4b0922abf..3fdeef179 100644 --- a/lib/features/main_editor/widgets/main_editor_background_video.dart +++ b/lib/features/main_editor/widgets/main_editor_background_video.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/features/filter_editor/types/filter_state.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_bottombar.dart b/lib/features/main_editor/widgets/main_editor_bottombar.dart index deb72a3de..82310d7f0 100644 --- a/lib/features/main_editor/widgets/main_editor_bottombar.dart +++ b/lib/features/main_editor/widgets/main_editor_bottombar.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/editor_scrollbar.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_font_preloader.dart b/lib/features/main_editor/widgets/main_editor_font_preloader.dart index 26ce04fd0..2b253f1be 100644 --- a/lib/features/main_editor/widgets/main_editor_font_preloader.dart +++ b/lib/features/main_editor/widgets/main_editor_font_preloader.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/emoji_editor_configs.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_helper_lines.dart b/lib/features/main_editor/widgets/main_editor_helper_lines.dart index b8e5a818b..8b96cdb6d 100644 --- a/lib/features/main_editor/widgets/main_editor_helper_lines.dart +++ b/lib/features/main_editor/widgets/main_editor_helper_lines.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '../../../shared/widgets/extended/interactive_viewer/extended_interactive_viewer.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_interactive_content.dart b/lib/features/main_editor/widgets/main_editor_interactive_content.dart index cbb8d2a20..ec8f932af 100644 --- a/lib/features/main_editor/widgets/main_editor_interactive_content.dart +++ b/lib/features/main_editor/widgets/main_editor_interactive_content.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_layers.dart b/lib/features/main_editor/widgets/main_editor_layers.dart index def05e414..0a0cc1b89 100644 --- a/lib/features/main_editor/widgets/main_editor_layers.dart +++ b/lib/features/main_editor/widgets/main_editor_layers.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/main_editor/widgets/main_editor_remove_layer_area.dart b/lib/features/main_editor/widgets/main_editor_remove_layer_area.dart index a918bf7c0..3ccaba8b0 100644 --- a/lib/features/main_editor/widgets/main_editor_remove_layer_area.dart +++ b/lib/features/main_editor/widgets/main_editor_remove_layer_area.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/layer_interaction_configs.dart'; import '/core/models/editor_configs/main_editor_configs.dart'; diff --git a/lib/features/paint_editor/controllers/paint_controller.dart b/lib/features/paint_editor/controllers/paint_controller.dart index 74ed54705..a087b4bd6 100644 --- a/lib/features/paint_editor/controllers/paint_controller.dart +++ b/lib/features/paint_editor/controllers/paint_controller.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../enums/paint_editor_enum.dart'; // Project imports: diff --git a/lib/features/paint_editor/paint_editor.dart b/lib/features/paint_editor/paint_editor.dart index ebd7482fb..9071c8a1a 100644 --- a/lib/features/paint_editor/paint_editor.dart +++ b/lib/features/paint_editor/paint_editor.dart @@ -3,8 +3,8 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/image_constants.dart'; import '/core/mixins/converted_callbacks.dart'; diff --git a/lib/features/paint_editor/services/paint_desktop_interaction_manager.dart b/lib/features/paint_editor/services/paint_desktop_interaction_manager.dart index 4041d1ab2..b13c53852 100644 --- a/lib/features/paint_editor/services/paint_desktop_interaction_manager.dart +++ b/lib/features/paint_editor/services/paint_desktop_interaction_manager.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; /// A manager class responsible for handling desktop interactions in the /// crop-rotate editor. diff --git a/lib/features/paint_editor/widgets/draw_paint_item.dart b/lib/features/paint_editor/widgets/draw_paint_item.dart index bda461a0f..e4ccfb53d 100644 --- a/lib/features/paint_editor/widgets/draw_paint_item.dart +++ b/lib/features/paint_editor/widgets/draw_paint_item.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/paint_editor/paint_editor_configs.dart'; import '../services/paint_item_hit_test_manager.dart'; diff --git a/lib/features/paint_editor/widgets/paint_canvas.dart b/lib/features/paint_editor/widgets/paint_canvas.dart index dbb6d3dd8..9f22e1a7d 100644 --- a/lib/features/paint_editor/widgets/paint_canvas.dart +++ b/lib/features/paint_editor/widgets/paint_canvas.dart @@ -4,7 +4,7 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/paint_editor/paint_editor_configs.dart'; import '/core/models/layers/layer.dart'; diff --git a/lib/features/paint_editor/widgets/paint_editor_appbar.dart b/lib/features/paint_editor/widgets/paint_editor_appbar.dart index e834863e4..e8d759b12 100644 --- a/lib/features/paint_editor/widgets/paint_editor_appbar.dart +++ b/lib/features/paint_editor/widgets/paint_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/platform/platform_popup_menu.dart'; diff --git a/lib/features/paint_editor/widgets/paint_editor_bottombar.dart b/lib/features/paint_editor/widgets/paint_editor_bottombar.dart index b3f7b9358..2e4eb2265 100644 --- a/lib/features/paint_editor/widgets/paint_editor_bottombar.dart +++ b/lib/features/paint_editor/widgets/paint_editor_bottombar.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/features/paint_editor/enums/paint_editor_enum.dart'; diff --git a/lib/features/paint_editor/widgets/paint_editor_color_picker.dart b/lib/features/paint_editor/widgets/paint_editor_color_picker.dart index cbd314e0a..78115a0f1 100644 --- a/lib/features/paint_editor/widgets/paint_editor_color_picker.dart +++ b/lib/features/paint_editor/widgets/paint_editor_color_picker.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/color_picker/bar_color_picker.dart'; diff --git a/lib/features/paint_editor/widgets/paint_editor_layer_editor.dart b/lib/features/paint_editor/widgets/paint_editor_layer_editor.dart index 3ad5f7df6..f9e2c9de8 100644 --- a/lib/features/paint_editor/widgets/paint_editor_layer_editor.dart +++ b/lib/features/paint_editor/widgets/paint_editor_layer_editor.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/pro_image_editor.dart'; import '/shared/widgets/layer/widgets/layer_widget_paint_item.dart'; diff --git a/lib/features/sticker_editor/sticker_editor.dart b/lib/features/sticker_editor/sticker_editor.dart index 3b6c5bc38..e913b30d1 100644 --- a/lib/features/sticker_editor/sticker_editor.dart +++ b/lib/features/sticker_editor/sticker_editor.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; @@ -27,7 +27,7 @@ class StickerEditor extends StatefulWidget with SimpleConfigsAccess { final ScrollController scrollController; @override - createState() => StickerEditorState(); + StickerEditorState createState() => StickerEditorState(); } /// The state class for the `StickerEditor` widget. diff --git a/lib/features/text_editor/text_editor.dart b/lib/features/text_editor/text_editor.dart index fce7c64c0..148225ebc 100644 --- a/lib/features/text_editor/text_editor.dart +++ b/lib/features/text_editor/text_editor.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_callbacks.dart'; import '/core/mixins/converted_configs.dart'; @@ -58,7 +58,7 @@ class TextEditor extends StatefulWidget with SimpleConfigsAccess { final double scaleFactor; @override - createState() => TextEditorState(); + TextEditorState createState() => TextEditorState(); } /// The state class for the `TextEditor` widget. diff --git a/lib/features/text_editor/utils/rounded_background_painter.dart b/lib/features/text_editor/utils/rounded_background_painter.dart index c7c4cf2b8..c4bfe7dec 100644 --- a/lib/features/text_editor/utils/rounded_background_painter.dart +++ b/lib/features/text_editor/utils/rounded_background_painter.dart @@ -1,7 +1,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; import '../models/line_metrics_model.dart'; diff --git a/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text.dart b/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text.dart index 64aacf9b1..7a071f8b0 100644 --- a/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text.dart +++ b/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../../utils/rounded_background_painter.dart'; diff --git a/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text_field.dart b/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text_field.dart index 67d79cb92..001f15022 100644 --- a/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text_field.dart +++ b/lib/features/text_editor/widgets/rounded_background_text/rounded_background_text_field.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import 'rounded_background_text.dart'; diff --git a/lib/features/text_editor/widgets/text_editor_appbar.dart b/lib/features/text_editor/widgets/text_editor_appbar.dart index 31c70b26e..862d1e28b 100644 --- a/lib/features/text_editor/widgets/text_editor_appbar.dart +++ b/lib/features/text_editor/widgets/text_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/enums/design_mode.dart'; import '/core/models/editor_configs/text_editor_configs.dart'; diff --git a/lib/features/text_editor/widgets/text_editor_bottom_bar.dart b/lib/features/text_editor/widgets/text_editor_bottom_bar.dart index cf7d74e01..9dc96cae2 100644 --- a/lib/features/text_editor/widgets/text_editor_bottom_bar.dart +++ b/lib/features/text_editor/widgets/text_editor_bottom_bar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/text_editor/widgets/text_editor_color_picker.dart b/lib/features/text_editor/widgets/text_editor_color_picker.dart index 3a35c24f8..9804fdc80 100644 --- a/lib/features/text_editor/widgets/text_editor_color_picker.dart +++ b/lib/features/text_editor/widgets/text_editor_color_picker.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/widgets/color_picker/bar_color_picker.dart'; diff --git a/lib/features/text_editor/widgets/text_editor_input.dart b/lib/features/text_editor/widgets/text_editor_input.dart index 39c603c66..79da9c5bb 100644 --- a/lib/features/text_editor/widgets/text_editor_input.dart +++ b/lib/features/text_editor/widgets/text_editor_input.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/text_editor_callbacks.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/features/tune_editor/models/tune_adjustment_item.dart b/lib/features/tune_editor/models/tune_adjustment_item.dart index 46e24874f..48847590f 100644 --- a/lib/features/tune_editor/models/tune_adjustment_item.dart +++ b/lib/features/tune_editor/models/tune_adjustment_item.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import './tune_adjustment_matrix.dart'; /// A class representing an adjustable tune item in the editor. diff --git a/lib/features/tune_editor/tune_editor.dart b/lib/features/tune_editor/tune_editor.dart index 49735215b..7f2672df0 100644 --- a/lib/features/tune_editor/tune_editor.dart +++ b/lib/features/tune_editor/tune_editor.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_callbacks.dart'; import '/core/mixins/converted_configs.dart'; @@ -153,7 +153,7 @@ class TuneEditor extends StatefulWidget final ProVideoController? videoController; @override - createState() => TuneEditorState(); + TuneEditorState createState() => TuneEditorState(); } /// The state class for the `TuneEditor` widget. diff --git a/lib/features/tune_editor/widgets/tune_editor_appbar.dart b/lib/features/tune_editor/widgets/tune_editor_appbar.dart index 60f8d42b6..74f6e39a5 100644 --- a/lib/features/tune_editor/widgets/tune_editor_appbar.dart +++ b/lib/features/tune_editor/widgets/tune_editor_appbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/tune_editor_configs.dart'; import '/core/models/i18n/i18n_tune_editor.dart'; diff --git a/lib/features/tune_editor/widgets/tune_editor_bottombar.dart b/lib/features/tune_editor/widgets/tune_editor_bottombar.dart index 6eafd35d0..f82581e04 100644 --- a/lib/features/tune_editor/widgets/tune_editor_bottombar.dart +++ b/lib/features/tune_editor/widgets/tune_editor_bottombar.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/tune_editor_configs.dart'; import '/shared/widgets/editor_scrollbar.dart'; diff --git a/lib/plugins/defer_pointer/defer_pointer.dart b/lib/plugins/defer_pointer/defer_pointer.dart index 857246458..e99fb271d 100644 --- a/lib/plugins/defer_pointer/defer_pointer.dart +++ b/lib/plugins/defer_pointer/defer_pointer.dart @@ -3,13 +3,14 @@ import 'dart:collection'; -// Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +// Flutter imports: +import 'package:material_ui/material_ui.dart'; + import '/shared/utils/unique_id_generator.dart'; -part 'deferred_pointer_handler_link.dart'; part 'deferred_pointer_handler.dart'; +part 'deferred_pointer_handler_link.dart'; /// Create a StatelessWidget to wrap our RenderObjectWidget so we can bind to /// inherited widget. diff --git a/lib/plugins/emoji_picker_flutter/locales/default_emoji_set_locale.dart b/lib/plugins/emoji_picker_flutter/locales/default_emoji_set_locale.dart index 7327ce081..b2c19364f 100644 --- a/lib/plugins/emoji_picker_flutter/locales/default_emoji_set_locale.dart +++ b/lib/plugins/emoji_picker_flutter/locales/default_emoji_set_locale.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar.dart b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar.dart index 15a703b8b..f2f2d0315 100644 --- a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar.dart +++ b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar_config.dart b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar_config.dart index 635997213..6ffe0586f 100644 --- a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar_config.dart +++ b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/bottom_action_bar_config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/default_bottom_action_bar.dart b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/default_bottom_action_bar.dart index 1fd54e9c4..c250dfed0 100644 --- a/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/default_bottom_action_bar.dart +++ b/lib/plugins/emoji_picker_flutter/src/bottom_action_bar/default_bottom_action_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/category_icon.dart b/lib/plugins/emoji_picker_flutter/src/category_view/category_icon.dart index 18e4783bc..7a9d41fd6 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/category_icon.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/category_icon.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Class that defines the icon representing a [Category] class CategoryIcon { diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/category_icons.dart b/lib/plugins/emoji_picker_flutter/src/category_view/category_icons.dart index e0dbe4647..829f8b322 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/category_icons.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/category_icons.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Class used to define all the [CategoryIcon] shown for each [Category] /// diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/category_view.dart b/lib/plugins/emoji_picker_flutter/src/category_view/category_view.dart index b39d4857c..9f8ef7e10 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/category_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/category_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/category_view_config.dart b/lib/plugins/emoji_picker_flutter/src/category_view/category_view_config.dart index 7efdb98b7..101f4e5c5 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/category_view_config.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/category_view_config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/default_category_tab_bar.dart b/lib/plugins/emoji_picker_flutter/src/category_view/default_category_tab_bar.dart index c305755d7..88777804c 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/default_category_tab_bar.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/default_category_tab_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/category_view/default_category_view.dart b/lib/plugins/emoji_picker_flutter/src/category_view/default_category_view.dart index 64b83d929..4c2e4b1bd 100644 --- a/lib/plugins/emoji_picker_flutter/src/category_view/default_category_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/category_view/default_category_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/config.dart b/lib/plugins/emoji_picker_flutter/src/config.dart index 1ba2d7dd7..7f175b3ba 100644 --- a/lib/plugins/emoji_picker_flutter/src/config.dart +++ b/lib/plugins/emoji_picker_flutter/src/config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; import '/plugins/emoji_picker_flutter/locales/default_emoji_set_locale.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji.dart b/lib/plugins/emoji_picker_flutter/src/emoji.dart index d9783cfa5..2da4fdc57 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Delimiter for keywords const _keywordDelimiter = ' | '; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_picker.dart b/lib/plugins/emoji_picker_flutter/src/emoji_picker.dart index f104effc3..502c30354 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_picker.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_picker.dart @@ -1,7 +1,7 @@ // ignore_for_file: constant_identifier_names import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/platform/io/io_helper.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_picker_utils.dart b/lib/plugins/emoji_picker_flutter/src/emoji_picker_utils.dart index 934b25914..9f0311dea 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_picker_utils.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_picker_utils.dart @@ -2,7 +2,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; import '/plugins/emoji_picker_flutter/src/emoji_picker_internal_utils.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_text_style.dart b/lib/plugins/emoji_picker_flutter/src/emoji_text_style.dart index 79e580081..eb2857b04 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_text_style.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_text_style.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Emoji text style providing commonly available fallback fonts // ignore: constant_identifier_names diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_view/default_emoji_picker_view.dart b/lib/plugins/emoji_picker_flutter/src/emoji_view/default_emoji_picker_view.dart index 60002b151..71986304b 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_view/default_emoji_picker_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_view/default_emoji_picker_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_container.dart b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_container.dart index a45449570..0ea5b2723 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_container.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_container.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/src/emoji_picker.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_picker_view.dart b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_picker_view.dart index b1d92a2b0..662013ee7 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_picker_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_picker_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/src/config.dart'; import '/plugins/emoji_picker_flutter/src/emoji_view_state.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_view_config.dart b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_view_config.dart index 3842136ac..07b22b9c0 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_view_config.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_view/emoji_view_config.dart @@ -2,7 +2,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/emoji_view_state.dart b/lib/plugins/emoji_picker_flutter/src/emoji_view_state.dart index 19b1442bc..2dffd7dac 100644 --- a/lib/plugins/emoji_picker_flutter/src/emoji_view_state.dart +++ b/lib/plugins/emoji_picker_flutter/src/emoji_view_state.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/search_view/default_search_view.dart b/lib/plugins/emoji_picker_flutter/src/search_view/default_search_view.dart index b75e518a4..847530025 100644 --- a/lib/plugins/emoji_picker_flutter/src/search_view/default_search_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/search_view/default_search_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; @@ -55,9 +55,7 @@ class DefaultSearchViewState extends SearchViewState { Row( children: [ IconButton( - onPressed: () { - widget.showEmojiView(); - }, + onPressed: widget.showEmojiView, color: widget.config.searchViewConfig.buttonIconColor, icon: const Icon(Icons.arrow_back), ), diff --git a/lib/plugins/emoji_picker_flutter/src/search_view/search_view.dart b/lib/plugins/emoji_picker_flutter/src/search_view/search_view.dart index 5474699c4..69171a157 100644 --- a/lib/plugins/emoji_picker_flutter/src/search_view/search_view.dart +++ b/lib/plugins/emoji_picker_flutter/src/search_view/search_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/search_view/search_view_config.dart b/lib/plugins/emoji_picker_flutter/src/search_view/search_view_config.dart index 7f07acccf..6cfa49dcc 100644 --- a/lib/plugins/emoji_picker_flutter/src/search_view/search_view_config.dart +++ b/lib/plugins/emoji_picker_flutter/src/search_view/search_view_config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_config.dart b/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_config.dart index 20d0d3f28..8d0b639f1 100644 --- a/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_config.dart +++ b/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Skin tone config Config class SkinToneConfig { diff --git a/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_overlay.dart b/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_overlay.dart index 277c1d206..644282491 100644 --- a/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_overlay.dart +++ b/lib/plugins/emoji_picker_flutter/src/skin_tones/skin_tone_overlay.dart @@ -1,6 +1,6 @@ import 'dart:collection'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/skin_tones/triangle_decoration.dart b/lib/plugins/emoji_picker_flutter/src/skin_tones/triangle_decoration.dart index bdc13249a..63972579c 100644 --- a/lib/plugins/emoji_picker_flutter/src/skin_tones/triangle_decoration.dart +++ b/lib/plugins/emoji_picker_flutter/src/skin_tones/triangle_decoration.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Decoration that can be used to render a triangle in the bottom-right /// corner of a container diff --git a/lib/plugins/emoji_picker_flutter/src/widgets/backspace_button.dart b/lib/plugins/emoji_picker_flutter/src/widgets/backspace_button.dart index 8fd960b9e..e9fd0631f 100644 --- a/lib/plugins/emoji_picker_flutter/src/widgets/backspace_button.dart +++ b/lib/plugins/emoji_picker_flutter/src/widgets/backspace_button.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/widgets/emoji_cell.dart b/lib/plugins/emoji_picker_flutter/src/widgets/emoji_cell.dart index 3d80bd557..3feda75dc 100644 --- a/lib/plugins/emoji_picker_flutter/src/widgets/emoji_cell.dart +++ b/lib/plugins/emoji_picker_flutter/src/widgets/emoji_cell.dart @@ -1,5 +1,5 @@ -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 '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/plugins/emoji_picker_flutter/src/widgets/search_button.dart b/lib/plugins/emoji_picker_flutter/src/widgets/search_button.dart index 6a986b0be..7214ef8c1 100644 --- a/lib/plugins/emoji_picker_flutter/src/widgets/search_button.dart +++ b/lib/plugins/emoji_picker_flutter/src/widgets/search_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/lib/shared/extensions/box_constraints_extension.dart b/lib/shared/extensions/box_constraints_extension.dart index b6ace8265..8736ea73a 100644 --- a/lib/shared/extensions/box_constraints_extension.dart +++ b/lib/shared/extensions/box_constraints_extension.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/int_constants.dart'; import 'num_extension.dart'; diff --git a/lib/shared/extensions/color_extension.dart b/lib/shared/extensions/color_extension.dart index 4d6df0e67..c012be4ed 100644 --- a/lib/shared/extensions/color_extension.dart +++ b/lib/shared/extensions/color_extension.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Extension on the [Color] class to provide a method for converting a color /// to its hexadecimal representation. diff --git a/lib/shared/services/content_recorder/controllers/content_recorder_controller.dart b/lib/shared/services/content_recorder/controllers/content_recorder_controller.dart index 435037edb..8223ca7ed 100644 --- a/lib/shared/services/content_recorder/controllers/content_recorder_controller.dart +++ b/lib/shared/services/content_recorder/controllers/content_recorder_controller.dart @@ -3,8 +3,8 @@ import 'dart:math'; import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/multi_threading/thread_capture_model.dart'; diff --git a/lib/shared/services/content_recorder/services/image_render_service.dart b/lib/shared/services/content_recorder/services/image_render_service.dart index 8f62ad31b..09ba488dd 100644 --- a/lib/shared/services/content_recorder/services/image_render_service.dart +++ b/lib/shared/services/content_recorder/services/image_render_service.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/image_generation_configs/image_generation_configs.dart'; import '/shared/utils/decode_image.dart'; diff --git a/lib/shared/services/content_recorder/utils/generate_high_quality_image.dart b/lib/shared/services/content_recorder/utils/generate_high_quality_image.dart index 6044487f3..9895a2938 100644 --- a/lib/shared/services/content_recorder/utils/generate_high_quality_image.dart +++ b/lib/shared/services/content_recorder/utils/generate_high_quality_image.dart @@ -1,7 +1,7 @@ import 'dart:typed_data'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/services/content_recorder/controllers/content_recorder_controller.dart'; diff --git a/lib/shared/services/content_recorder/widgets/content_recorder.dart b/lib/shared/services/content_recorder/widgets/content_recorder.dart index 309109455..f35a8f3e3 100644 --- a/lib/shared/services/content_recorder/widgets/content_recorder.dart +++ b/lib/shared/services/content_recorder/widgets/content_recorder.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/shared/widgets/extended/repaint/extended_repaint_boundary.dart'; diff --git a/lib/shared/services/layer_rasterizer/layer_rasterizer_host.dart b/lib/shared/services/layer_rasterizer/layer_rasterizer_host.dart index c8472499c..e402aece9 100644 --- a/lib/shared/services/layer_rasterizer/layer_rasterizer_host.dart +++ b/lib/shared/services/layer_rasterizer/layer_rasterizer_host.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/shared/utils/default_editor_theme.dart'; diff --git a/lib/shared/styles/platform_text_styles.dart b/lib/shared/styles/platform_text_styles.dart index 05e28d5f4..f9aede9c8 100644 --- a/lib/shared/styles/platform_text_styles.dart +++ b/lib/shared/styles/platform_text_styles.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/enums/design_mode.dart'; diff --git a/lib/shared/utils/default_editor_theme.dart b/lib/shared/utils/default_editor_theme.dart index 1bb0e422d..4e5610d7c 100644 --- a/lib/shared/utils/default_editor_theme.dart +++ b/lib/shared/utils/default_editor_theme.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The theme the editor falls back to when `ProImageEditorConfigs.theme` is /// `null`. diff --git a/lib/shared/widgets/adaptive_dialog.dart b/lib/shared/widgets/adaptive_dialog.dart index 77853f896..ef090ba36 100644 --- a/lib/shared/widgets/adaptive_dialog.dart +++ b/lib/shared/widgets/adaptive_dialog.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/enums/design_mode.dart'; diff --git a/lib/shared/widgets/animated/fade_in_base.dart b/lib/shared/widgets/animated/fade_in_base.dart index c008d0bd2..d5222072f 100644 --- a/lib/shared/widgets/animated/fade_in_base.dart +++ b/lib/shared/widgets/animated/fade_in_base.dart @@ -1,5 +1,5 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// An abstract base widget that applies a fade-in and slide-in animation /// to its child. diff --git a/lib/shared/widgets/animated/fade_in_left.dart b/lib/shared/widgets/animated/fade_in_left.dart index ab02cff50..8fc556b2d 100644 --- a/lib/shared/widgets/animated/fade_in_left.dart +++ b/lib/shared/widgets/animated/fade_in_left.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'fade_in_base.dart'; diff --git a/lib/shared/widgets/animated/fade_in_up.dart b/lib/shared/widgets/animated/fade_in_up.dart index 84f0d4b12..816c680b4 100644 --- a/lib/shared/widgets/animated/fade_in_up.dart +++ b/lib/shared/widgets/animated/fade_in_up.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'fade_in_base.dart'; diff --git a/lib/shared/widgets/bottom_sheets_header_row.dart b/lib/shared/widgets/bottom_sheets_header_row.dart index 245596f55..97747d702 100644 --- a/lib/shared/widgets/bottom_sheets_header_row.dart +++ b/lib/shared/widgets/bottom_sheets_header_row.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A custom widget for the header row of a bottom sheet. class BottomSheetHeaderRow extends StatefulWidget { diff --git a/lib/shared/widgets/censor/pixelate_area_item.dart b/lib/shared/widgets/censor/pixelate_area_item.dart index c670f5a3e..b5f01abae 100644 --- a/lib/shared/widgets/censor/pixelate_area_item.dart +++ b/lib/shared/widgets/censor/pixelate_area_item.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/main_editor/providers/image_infos_provider.dart'; import '/shared/services/shader_manager.dart'; diff --git a/lib/shared/widgets/color_picker/bar_color_picker.dart b/lib/shared/widgets/color_picker/bar_color_picker.dart index c19f50d53..c269fcfc0 100644 --- a/lib/shared/widgets/color_picker/bar_color_picker.dart +++ b/lib/shared/widgets/color_picker/bar_color_picker.dart @@ -3,7 +3,7 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/shared/extensions/color_extension.dart'; @@ -91,7 +91,7 @@ class BarColorPicker extends StatefulWidget { final Duration animationDuration; @override - createState() => _BarColorPickerState(); + _BarColorPickerState createState() => _BarColorPickerState(); } class _BarColorPickerState extends State diff --git a/lib/shared/widgets/editor_scrollbar.dart b/lib/shared/widgets/editor_scrollbar.dart index cd79f1302..d2266d4f3 100644 --- a/lib/shared/widgets/editor_scrollbar.dart +++ b/lib/shared/widgets/editor_scrollbar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../utils/platform_info.dart'; diff --git a/lib/shared/widgets/flat_icon_text_button.dart b/lib/shared/widgets/flat_icon_text_button.dart index 610960d7c..092120e2d 100644 --- a/lib/shared/widgets/flat_icon_text_button.dart +++ b/lib/shared/widgets/flat_icon_text_button.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A custom TextButton widget with an icon placed above the label. class FlatIconTextButton extends TextButton { diff --git a/lib/shared/widgets/layer/interaction_helper/layer_interaction_button.dart b/lib/shared/widgets/layer/interaction_helper/layer_interaction_button.dart index a59af8339..6a871a402 100644 --- a/lib/shared/widgets/layer/interaction_helper/layer_interaction_button.dart +++ b/lib/shared/widgets/layer/interaction_helper/layer_interaction_button.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:material_ui/material_ui.dart'; /// A stateful widget that represents a customizable button for interacting /// with layers. diff --git a/lib/shared/widgets/layer/interaction_helper/layer_interaction_helper_widget.dart b/lib/shared/widgets/layer/interaction_helper/layer_interaction_helper_widget.dart index 964603099..69d69a46d 100644 --- a/lib/shared/widgets/layer/interaction_helper/layer_interaction_helper_widget.dart +++ b/lib/shared/widgets/layer/interaction_helper/layer_interaction_helper_widget.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/mixins/converted_configs.dart'; import '/core/mixins/editor_configs_mixin.dart'; diff --git a/lib/shared/widgets/layer/layer_drag_selection_area_widget.dart b/lib/shared/widgets/layer/layer_drag_selection_area_widget.dart index b79bcc673..5d8290870 100644 --- a/lib/shared/widgets/layer/layer_drag_selection_area_widget.dart +++ b/lib/shared/widgets/layer/layer_drag_selection_area_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/main_editor/services/layer_drag_selection_service.dart'; diff --git a/lib/shared/widgets/layer/layer_stack.dart b/lib/shared/widgets/layer/layer_stack.dart index a89266797..08a1b3f45 100644 --- a/lib/shared/widgets/layer/layer_stack.dart +++ b/lib/shared/widgets/layer/layer_stack.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/layers/layer.dart'; diff --git a/lib/shared/widgets/layer/layer_widget.dart b/lib/shared/widgets/layer/layer_widget.dart index 3fd055e6a..b156d846e 100644 --- a/lib/shared/widgets/layer/layer_widget.dart +++ b/lib/shared/widgets/layer/layer_widget.dart @@ -5,7 +5,7 @@ import 'dart:math'; // Flutter imports: import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/constants/editor_various_constants.dart'; import '/core/mixins/converted_configs.dart'; @@ -83,7 +83,7 @@ class LayerWidget extends StatefulWidget with SimpleConfigsAccess { final ValueNotifier? playTimeNotifier; @override - createState() => _LayerWidgetState(); + _LayerWidgetState createState() => _LayerWidgetState(); } class _LayerWidgetState extends State diff --git a/lib/shared/widgets/layer/services/layer_widget_context_menu.dart b/lib/shared/widgets/layer/services/layer_widget_context_menu.dart index 5948a38e1..a4dd1c000 100644 --- a/lib/shared/widgets/layer/services/layer_widget_context_menu.dart +++ b/lib/shared/widgets/layer/services/layer_widget_context_menu.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/i18n/i18n_layer_interaction.dart'; import '/core/models/icons/layer_interaction_icons.dart'; diff --git a/lib/shared/widgets/layer/widgets/layer_widget_censor_item.dart b/lib/shared/widgets/layer/widgets/layer_widget_censor_item.dart index 337b81cb8..f5c13a660 100644 --- a/lib/shared/widgets/layer/widgets/layer_widget_censor_item.dart +++ b/lib/shared/widgets/layer/widgets/layer_widget_censor_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/paint_editor/censor_configs.dart'; import '/core/models/layers/paint_layer.dart'; diff --git a/lib/shared/widgets/layer/widgets/layer_widget_custom_item.dart b/lib/shared/widgets/layer/widgets/layer_widget_custom_item.dart index 62199afe8..95fcc30a7 100644 --- a/lib/shared/widgets/layer/widgets/layer_widget_custom_item.dart +++ b/lib/shared/widgets/layer/widgets/layer_widget_custom_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/sticker_editor_configs.dart'; import '/core/models/layers/widget_layer.dart'; diff --git a/lib/shared/widgets/layer/widgets/layer_widget_emoji_item.dart b/lib/shared/widgets/layer/widgets/layer_widget_emoji_item.dart index 9d00c9496..ffabaa634 100644 --- a/lib/shared/widgets/layer/widgets/layer_widget_emoji_item.dart +++ b/lib/shared/widgets/layer/widgets/layer_widget_emoji_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/enums/design_mode.dart'; import '/core/models/editor_configs/emoji_editor_configs.dart'; diff --git a/lib/shared/widgets/layer/widgets/layer_widget_paint_item.dart b/lib/shared/widgets/layer/widgets/layer_widget_paint_item.dart index c6256fae8..291ac9867 100644 --- a/lib/shared/widgets/layer/widgets/layer_widget_paint_item.dart +++ b/lib/shared/widgets/layer/widgets/layer_widget_paint_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/paint_editor/paint_editor_configs.dart'; import '/core/models/layers/paint_layer.dart'; diff --git a/lib/shared/widgets/layer/widgets/layer_widget_text_item.dart b/lib/shared/widgets/layer/widgets/layer_widget_text_item.dart index 2877174a8..be88f9f06 100644 --- a/lib/shared/widgets/layer/widgets/layer_widget_text_item.dart +++ b/lib/shared/widgets/layer/widgets/layer_widget_text_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/text_editor_configs.dart'; import '/core/models/layers/text_layer.dart'; diff --git a/lib/shared/widgets/overlays/loading_dialog/loading_dialog.dart b/lib/shared/widgets/overlays/loading_dialog/loading_dialog.dart index e63e3a12f..f2211eb4b 100644 --- a/lib/shared/widgets/overlays/loading_dialog/loading_dialog.dart +++ b/lib/shared/widgets/overlays/loading_dialog/loading_dialog.dart @@ -1,7 +1,7 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/shared/widgets/overlays/loading_dialog/models/loading_dialog_overlay_details.dart b/lib/shared/widgets/overlays/loading_dialog/models/loading_dialog_overlay_details.dart index 6dc96c166..dd62ec3d4 100644 --- a/lib/shared/widgets/overlays/loading_dialog/models/loading_dialog_overlay_details.dart +++ b/lib/shared/widgets/overlays/loading_dialog/models/loading_dialog_overlay_details.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../animations/loading_dialog_base_animation.dart'; diff --git a/lib/shared/widgets/platform/platform_circular_progress_indicator.dart b/lib/shared/widgets/platform/platform_circular_progress_indicator.dart index 2523adf39..b34298612 100644 --- a/lib/shared/widgets/platform/platform_circular_progress_indicator.dart +++ b/lib/shared/widgets/platform/platform_circular_progress_indicator.dart @@ -1,6 +1,6 @@ // Flutter imports: -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 '/core/models/editor_configs/pro_image_editor_configs.dart'; /// A circular progress indicator that adapts to the platform. diff --git a/lib/shared/widgets/platform/platform_popup_menu.dart b/lib/shared/widgets/platform/platform_popup_menu.dart index 5daf20986..bffdd9934 100644 --- a/lib/shared/widgets/platform/platform_popup_menu.dart +++ b/lib/shared/widgets/platform/platform_popup_menu.dart @@ -1,6 +1,6 @@ // Flutter imports: -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/enums/design_mode.dart'; diff --git a/lib/shared/widgets/reactive_widgets/reactive_custom_appbar.dart b/lib/shared/widgets/reactive_widgets/reactive_custom_appbar.dart index 91bcc5378..465860f83 100644 --- a/lib/shared/widgets/reactive_widgets/reactive_custom_appbar.dart +++ b/lib/shared/widgets/reactive_widgets/reactive_custom_appbar.dart @@ -1,5 +1,5 @@ // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A custom app bar widget that reacts to stream updates. /// diff --git a/lib/shared/widgets/screen_resize_detector.dart b/lib/shared/widgets/screen_resize_detector.dart index ab299d57e..4095e44e2 100644 --- a/lib/shared/widgets/screen_resize_detector.dart +++ b/lib/shared/widgets/screen_resize_detector.dart @@ -2,7 +2,7 @@ import 'dart:ui'; // Flutter imports: -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '../utils/debounce.dart'; diff --git a/lib/shared/widgets/slider_bottom_sheet.dart b/lib/shared/widgets/slider_bottom_sheet.dart index 041d38133..a346db962 100644 --- a/lib/shared/widgets/slider_bottom_sheet.dart +++ b/lib/shared/widgets/slider_bottom_sheet.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/enums/design_mode.dart'; import '/shared/styles/platform_text_styles.dart'; diff --git a/lib/shared/widgets/transform/transformed_content_generator.dart b/lib/shared/widgets/transform/transformed_content_generator.dart index d92a1a390..a39cb3baa 100644 --- a/lib/shared/widgets/transform/transformed_content_generator.dart +++ b/lib/shared/widgets/transform/transformed_content_generator.dart @@ -1,6 +1,6 @@ // Flutter imports: import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; // Project imports: import '/core/models/editor_configs/pro_image_editor_configs.dart'; diff --git a/lib/shared/widgets/video/export_prebuild/video_editor_prebuild_remove_area.dart b/lib/shared/widgets/video/export_prebuild/video_editor_prebuild_remove_area.dart index d71563384..63c590cac 100644 --- a/lib/shared/widgets/video/export_prebuild/video_editor_prebuild_remove_area.dart +++ b/lib/shared/widgets/video/export_prebuild/video_editor_prebuild_remove_area.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/features/main_editor/main_editor.dart'; /// A widget representing the remove area in the video editor. diff --git a/lib/shared/widgets/video/toolbar/video_editor_info_banner.dart b/lib/shared/widgets/video/toolbar/video_editor_info_banner.dart index 9d31596c5..630e266a5 100644 --- a/lib/shared/widgets/video/toolbar/video_editor_info_banner.dart +++ b/lib/shared/widgets/video/toolbar/video_editor_info_banner.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/video/trim_duration_span_model.dart'; import '/shared/controllers/video_controller.dart'; import '/shared/extensions/duration_extension.dart'; diff --git a/lib/shared/widgets/video/toolbar/video_editor_mute_button.dart b/lib/shared/widgets/video/toolbar/video_editor_mute_button.dart index c6c4e0885..b86eef4c9 100644 --- a/lib/shared/widgets/video/toolbar/video_editor_mute_button.dart +++ b/lib/shared/widgets/video/toolbar/video_editor_mute_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/shared/widgets/video/video_editor_configurable.dart'; import '../../gesture/gesture_interceptor_widget.dart'; diff --git a/lib/shared/widgets/video/toolbar/video_editor_play_button.dart b/lib/shared/widgets/video/toolbar/video_editor_play_button.dart index 3fb768a32..a9b26dbe2 100644 --- a/lib/shared/widgets/video/toolbar/video_editor_play_button.dart +++ b/lib/shared/widgets/video/toolbar/video_editor_play_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/shared/widgets/video/video_editor_configurable.dart'; import '../../gesture/gesture_interceptor_widget.dart'; diff --git a/lib/shared/widgets/video/trimmer/video_editor_play_time_indicator.dart b/lib/shared/widgets/video/trimmer/video_editor_play_time_indicator.dart index 125d800d7..311e7f90f 100644 --- a/lib/shared/widgets/video/trimmer/video_editor_play_time_indicator.dart +++ b/lib/shared/widgets/video/trimmer/video_editor_play_time_indicator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../video_editor_configurable.dart'; diff --git a/lib/shared/widgets/video/trimmer/video_editor_trim_bar.dart b/lib/shared/widgets/video/trimmer/video_editor_trim_bar.dart index c30619684..b0d767e52 100644 --- a/lib/shared/widgets/video/trimmer/video_editor_trim_bar.dart +++ b/lib/shared/widgets/video/trimmer/video_editor_trim_bar.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/pro_image_editor_configs.dart'; import '/core/models/video/trim_duration_span_model.dart'; diff --git a/lib/shared/widgets/video/trimmer/video_editor_trim_handle.dart b/lib/shared/widgets/video/trimmer/video_editor_trim_handle.dart index 9a2649ea6..aaf35b4d7 100644 --- a/lib/shared/widgets/video/trimmer/video_editor_trim_handle.dart +++ b/lib/shared/widgets/video/trimmer/video_editor_trim_handle.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; import '../video_editor_configurable.dart'; diff --git a/lib/shared/widgets/video/trimmer/video_editor_trim_skeleton.dart b/lib/shared/widgets/video/trimmer/video_editor_trim_skeleton.dart index 3570ded0e..6f2e8a59d 100644 --- a/lib/shared/widgets/video/trimmer/video_editor_trim_skeleton.dart +++ b/lib/shared/widgets/video/trimmer/video_editor_trim_skeleton.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../video_editor_configurable.dart'; diff --git a/lib/shared/widgets/video/trimmer/video_editor_trim_thumbnail_bar.dart b/lib/shared/widgets/video/trimmer/video_editor_trim_thumbnail_bar.dart index 4a04cfb92..6c38b61e4 100644 --- a/lib/shared/widgets/video/trimmer/video_editor_trim_thumbnail_bar.dart +++ b/lib/shared/widgets/video/trimmer/video_editor_trim_thumbnail_bar.dart @@ -1,5 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; + import '/shared/widgets/video/video_editor_configurable.dart'; import 'video_editor_trim_skeleton.dart'; diff --git a/lib/shared/widgets/video/video_editor_configurable.dart b/lib/shared/widgets/video/video_editor_configurable.dart index d0afcfb50..c7dcc404d 100644 --- a/lib/shared/widgets/video/video_editor_configurable.dart +++ b/lib/shared/widgets/video/video_editor_configurable.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_callbacks/video_editor_callbacks.dart'; import '/core/models/editor_configs/video/video_editor_configs.dart'; diff --git a/lib/shared/widgets/video/video_editor_controls_widget.dart b/lib/shared/widgets/video/video_editor_controls_widget.dart index ed468827c..d4cec8676 100644 --- a/lib/shared/widgets/video/video_editor_controls_widget.dart +++ b/lib/shared/widgets/video/video_editor_controls_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '/core/models/editor_configs/video/video_editor_configs.dart'; import '/core/models/video/trim_duration_span_model.dart'; diff --git a/lib/shared/widgets/video/video_editor_state_widget.dart b/lib/shared/widgets/video/video_editor_state_widget.dart index d5f70a3dc..de20b340e 100644 --- a/lib/shared/widgets/video/video_editor_state_widget.dart +++ b/lib/shared/widgets/video/video_editor_state_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'video_editor_configurable.dart'; /// Displays the current play state in the video editor. diff --git a/pubspec.yaml b/pubspec.yaml index 72b2af58b..27a346e0c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,6 +44,8 @@ dependencies: vector_math: ^2.2.0 web: ^1.1.1 + material_ui: any + cupertino_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/test/core/models/layers/layer_capture_test.dart b/test/core/models/layers/layer_capture_test.dart index 1b7e613e9..25bb8d5e3 100644 --- a/test/core/models/layers/layer_capture_test.dart +++ b/test/core/models/layers/layer_capture_test.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import '../../../mock/mock_image.dart'; diff --git a/test/core/models/layers/layer_test.dart b/test/core/models/layers/layer_test.dart index b537e7dab..5d48ed792 100644 --- a/test/core/models/layers/layer_test.dart +++ b/test/core/models/layers/layer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; import 'package:pro_image_editor/core/models/layers/layer.dart'; import 'package:pro_image_editor/core/models/layers/layer_interaction.dart'; diff --git a/test/core/models/layers/paint_layer_test.dart b/test/core/models/layers/paint_layer_test.dart index 6bb151337..1b6fd9c8b 100644 --- a/test/core/models/layers/paint_layer_test.dart +++ b/test/core/models/layers/paint_layer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/services/import_export/utils/key_minifier.dart'; diff --git a/test/core/models/layers/text_layer_test.dart b/test/core/models/layers/text_layer_test.dart index 256c87d79..a36f9aaa2 100644 --- a/test/core/models/layers/text_layer_test.dart +++ b/test/core/models/layers/text_layer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/layers/enums/layer_background_mode.dart'; import 'package:pro_image_editor/core/models/layers/text_layer.dart'; import 'package:pro_image_editor/shared/extensions/color_extension.dart'; diff --git a/test/core/models/layers/widget_layer_test.dart b/test/core/models/layers/widget_layer_test.dart index 1b99b0e31..00a53240b 100644 --- a/test/core/models/layers/widget_layer_test.dart +++ b/test/core/models/layers/widget_layer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/layers/widget_layer.dart'; void main() { diff --git a/test/features/blur_editor_test.dart b/test/features/blur_editor_test.dart index 3f6679fce..b45c0fa6e 100644 --- a/test/features/blur_editor_test.dart +++ b/test/features/blur_editor_test.dart @@ -1,8 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:network_image_mock/network_image_mock.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/crop_rotate_editor/crop_rotate_editor_test.dart b/test/features/crop_rotate_editor/crop_rotate_editor_test.dart index b82d2a0ec..01e076ca1 100644 --- a/test/features/crop_rotate_editor/crop_rotate_editor_test.dart +++ b/test/features/crop_rotate_editor/crop_rotate_editor_test.dart @@ -2,10 +2,9 @@ // Flutter imports: import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:network_image_mock/network_image_mock.dart'; import 'package:pro_image_editor/core/models/editor_callbacks/pro_image_editor_callbacks.dart'; import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; @@ -13,6 +12,7 @@ import 'package:pro_image_editor/core/models/init_configs/crop_rotate_editor_ini import 'package:pro_image_editor/features/crop_rotate_editor/crop_rotate_editor.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/utils/crop_aspect_ratios.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/widgets/outside_gestures/crop_rotate_gesture_detector.dart'; + import '../../mock/mock_image.dart'; void main() { diff --git a/test/features/crop_rotate_editor/widgets/crop_aspect_ratio_options_test.dart b/test/features/crop_rotate_editor/widgets/crop_aspect_ratio_options_test.dart index 7f0d1bf20..80ad871e9 100644 --- a/test/features/crop_rotate_editor/widgets/crop_aspect_ratio_options_test.dart +++ b/test/features/crop_rotate_editor/widgets/crop_aspect_ratio_options_test.dart @@ -1,8 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/widgets/crop_aspect_ratio_button.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart index 8a6ab6384..fabd963f8 100644 --- a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart +++ b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart @@ -1,11 +1,10 @@ // Dart imports: import 'dart:ui' as ui; -// Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +// Flutter imports: +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/styles/crop_rotate_editor_style.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/widgets/crop_corner_painter.dart'; import 'package:pro_image_editor/shared/extensions/matrix_extension.dart'; @@ -162,7 +161,7 @@ void main() { // Reconstruct the tilted image quad with the same transform the // painter uses, then sample its centroid (clearly inside the image, // outside the crop) and a point far outside the quad. - final center = Offset(imageSize.width / 2, imageSize.height / 2); + const center = Offset(imageSize.width / 2, imageSize.height / 2); final tiltMatrix = Matrix4.identity().tilt( rotate: 0, vertical: 0, @@ -175,9 +174,9 @@ void main() { final corners = [ toScreen(const Offset(0, 0)), - toScreen(Offset(imageSize.width, 0)), - toScreen(Offset(imageSize.width, imageSize.height)), - toScreen(Offset(0, imageSize.height)), + toScreen(const Offset(imageSize.width, 0)), + toScreen(const Offset(imageSize.width, imageSize.height)), + toScreen(const Offset(0, imageSize.height)), ]; final centroid = corners.reduce((a, b) => a + b) / corners.length.toDouble(); diff --git a/test/features/crop_rotate_editor/widgets/tilt/tilt_item_row_test.dart b/test/features/crop_rotate_editor/widgets/tilt/tilt_item_row_test.dart index 0cac6abfa..6b084925a 100644 --- a/test/features/crop_rotate_editor/widgets/tilt/tilt_item_row_test.dart +++ b/test/features/crop_rotate_editor/widgets/tilt/tilt_item_row_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_configs/crop_rotate_editor_configs.dart'; import 'package:pro_image_editor/core/models/i18n/i18n_crop_rotate_editor.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/providers/tilt_provider.dart'; diff --git a/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser_test.dart b/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser_test.dart index 2caa65d87..ea30c5bc3 100644 --- a/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser_test.dart +++ b/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_chooser_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: invalid_use_of_protected_member -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; import 'package:pro_image_editor/core/models/init_configs/crop_rotate_editor_init_configs.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/crop_rotate_editor.dart'; diff --git a/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_test.dart b/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_test.dart index 9b60cd2c3..2037ba112 100644 --- a/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_test.dart +++ b/test/features/crop_rotate_editor/widgets/tilt/tilt_ruler_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_configs/crop_rotate_editor_configs.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/widgets/tilt/tilt_ruler.dart'; diff --git a/test/features/emoji_editor_test.dart b/test/features/emoji_editor_test.dart index 0ca5da44e..f3a307035 100644 --- a/test/features/emoji_editor_test.dart +++ b/test/features/emoji_editor_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/emoji_editor/emoji_editor.dart'; import 'package:pro_image_editor/plugins/emoji_picker_flutter/emoji_picker_flutter.dart'; diff --git a/test/features/filter_editor_test.dart b/test/features/filter_editor_test.dart index 1cabd6a86..072f1590c 100644 --- a/test/features/filter_editor_test.dart +++ b/test/features/filter_editor_test.dart @@ -1,8 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:network_image_mock/network_image_mock.dart'; import 'package:pro_image_editor/core/models/init_configs/filter_editor_init_configs.dart'; import 'package:pro_image_editor/features/filter_editor/filter_editor.dart'; diff --git a/test/features/main_editor/merge_filters_test.dart b/test/features/main_editor/merge_filters_test.dart index ea20e555b..81a06da37 100644 --- a/test/features/main_editor/merge_filters_test.dart +++ b/test/features/main_editor/merge_filters_test.dart @@ -1,10 +1,8 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/main_editor/merge_selected_layers_test.dart b/test/features/main_editor/merge_selected_layers_test.dart index deaed3798..75e5a4c5f 100644 --- a/test/features/main_editor/merge_selected_layers_test.dart +++ b/test/features/main_editor/merge_selected_layers_test.dart @@ -1,10 +1,8 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/main_editor/multitouch_third_finger_test.dart b/test/features/main_editor/multitouch_third_finger_test.dart index e06e9dc00..5921c6f2f 100644 --- a/test/features/main_editor/multitouch_third_finger_test.dart +++ b/test/features/main_editor/multitouch_third_finger_test.dart @@ -1,12 +1,10 @@ // Flutter imports: import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/main_editor/services/paint_layer_merge_manager_test.dart b/test/features/main_editor/services/paint_layer_merge_manager_test.dart index fd06cf4aa..8aad16c8e 100644 --- a/test/features/main_editor/services/paint_layer_merge_manager_test.dart +++ b/test/features/main_editor/services/paint_layer_merge_manager_test.dart @@ -1,7 +1,7 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/main_editor/services/paint_layer_merge_manager.dart'; import 'package:pro_image_editor/features/paint_editor/models/eraser_model.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/main_editor/sizes_manager_test.dart b/test/features/main_editor/sizes_manager_test.dart index 41cef9979..ae11aafc8 100644 --- a/test/features/main_editor/sizes_manager_test.dart +++ b/test/features/main_editor/sizes_manager_test.dart @@ -1,9 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/features/main_editor/services/sizes_manager.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/main_editor_test.dart b/test/features/main_editor_test.dart index 86e18bec5..ea0db77d3 100644 --- a/test/features/main_editor_test.dart +++ b/test/features/main_editor_test.dart @@ -1,11 +1,9 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:network_image_mock/network_image_mock.dart'; - // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/widgets/layer/layer_widget.dart'; diff --git a/test/features/paint_editor/paint_editor_test.dart b/test/features/paint_editor/paint_editor_test.dart index 831d4da1b..43ba3a693 100644 --- a/test/features/paint_editor/paint_editor_test.dart +++ b/test/features/paint_editor/paint_editor_test.dart @@ -1,9 +1,8 @@ // Flutter imports: import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:network_image_mock/network_image_mock.dart'; import 'package:pro_image_editor/features/paint_editor/widgets/paint_canvas.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/paint_editor/painting_canvas_test.dart b/test/features/paint_editor/painting_canvas_test.dart index 225c83306..c94a88b8d 100644 --- a/test/features/paint_editor/painting_canvas_test.dart +++ b/test/features/paint_editor/painting_canvas_test.dart @@ -1,8 +1,7 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/paint_editor/controllers/paint_controller.dart'; import 'package:pro_image_editor/features/paint_editor/widgets/paint_canvas.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/paint_editor/utils/draw/draw_canvas_test.dart b/test/features/paint_editor/utils/draw/draw_canvas_test.dart index 2f110a68a..a4232a132 100644 --- a/test/features/paint_editor/utils/draw/draw_canvas_test.dart +++ b/test/features/paint_editor/utils/draw/draw_canvas_test.dart @@ -1,8 +1,8 @@ // Flutter imports: -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/paint_editor/enums/paint_editor_enum.dart'; import 'package:pro_image_editor/features/paint_editor/models/painted_model.dart'; import 'package:pro_image_editor/features/paint_editor/widgets/draw_paint_item.dart'; diff --git a/test/features/paint_editor/utils/paint_controller_test.dart b/test/features/paint_editor/utils/paint_controller_test.dart index 8392bd4ce..6dbe60013 100644 --- a/test/features/paint_editor/utils/paint_controller_test.dart +++ b/test/features/paint_editor/utils/paint_controller_test.dart @@ -1,7 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/paint_editor/controllers/paint_controller.dart'; import 'package:pro_image_editor/features/paint_editor/enums/paint_editor_enum.dart'; diff --git a/test/features/paint_editor/widgets/paint_editor_layer_editor_test.dart b/test/features/paint_editor/widgets/paint_editor_layer_editor_test.dart index dace13052..9c04bfc56 100644 --- a/test/features/paint_editor/widgets/paint_editor_layer_editor_test.dart +++ b/test/features/paint_editor/widgets/paint_editor_layer_editor_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/paint_editor/widgets/paint_editor_layer_editor.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/widgets/layer/widgets/layer_widget_paint_item.dart'; diff --git a/test/features/sticker_editor_test.dart b/test/features/sticker_editor_test.dart index ebc5d7e59..cdb614c65 100644 --- a/test/features/sticker_editor_test.dart +++ b/test/features/sticker_editor_test.dart @@ -1,9 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/features/text_editor/rounded_background_text_field_hitbox_test.dart b/test/features/text_editor/rounded_background_text_field_hitbox_test.dart index badcb09ac..454652fd0 100644 --- a/test/features/text_editor/rounded_background_text_field_hitbox_test.dart +++ b/test/features/text_editor/rounded_background_text_field_hitbox_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_configs/text_editor_configs.dart'; import 'package:pro_image_editor/features/text_editor/widgets/rounded_background_text/rounded_background_text.dart'; import 'package:pro_image_editor/features/text_editor/widgets/rounded_background_text/rounded_background_text_field.dart'; diff --git a/test/features/text_editor_test.dart b/test/features/text_editor_test.dart index 2b11f15ba..de043c24d 100644 --- a/test/features/text_editor_test.dart +++ b/test/features/text_editor_test.dart @@ -1,8 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/features/text_editor/text_editor.dart'; import 'package:pro_image_editor/shared/widgets/slider_bottom_sheet.dart'; diff --git a/test/features/tune_editor_test.dart b/test/features/tune_editor_test.dart index dcca08654..66c11c089 100644 --- a/test/features/tune_editor_test.dart +++ b/test/features/tune_editor_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/mockito.dart'; import 'package:network_image_mock/network_image_mock.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/mock/layers/paint_layer_mock.dart b/test/mock/layers/paint_layer_mock.dart index 3857c5a0c..f91ce9067 100644 --- a/test/mock/layers/paint_layer_mock.dart +++ b/test/mock/layers/paint_layer_mock.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/layers/layer_interaction.dart'; import 'package:pro_image_editor/core/models/layers/paint_layer.dart'; import 'package:pro_image_editor/features/paint_editor/paint_editor.dart'; diff --git a/test/mock/layers/text_layer_mock.dart b/test/mock/layers/text_layer_mock.dart index cb88b9100..308d09e6a 100644 --- a/test/mock/layers/text_layer_mock.dart +++ b/test/mock/layers/text_layer_mock.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/layers/layer_interaction.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/test/mock/layers/widget_layer_mock.dart b/test/mock/layers/widget_layer_mock.dart index d9dc82505..5c1f2b845 100644 --- a/test/mock/layers/widget_layer_mock.dart +++ b/test/mock/layers/widget_layer_mock.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/layers/layer_interaction.dart'; import 'package:pro_image_editor/core/models/layers/widget_layer.dart'; diff --git a/test/models/editor_image_test.dart b/test/models/editor_image_test.dart index f3f1042fc..ccdec602a 100644 --- a/test/models/editor_image_test.dart +++ b/test/models/editor_image_test.dart @@ -1,11 +1,10 @@ // Dart imports: import 'dart:typed_data'; -// Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +// Flutter imports: +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_image.dart'; import 'package:pro_image_editor/core/platform/io/io_helper.dart'; diff --git a/test/shared/factories/editor_mapper_test.dart b/test/shared/factories/editor_mapper_test.dart index e233f2bfd..d0e3bd2f0 100644 --- a/test/shared/factories/editor_mapper_test.dart +++ b/test/shared/factories/editor_mapper_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/factories/editor_mapper.dart'; diff --git a/test/shared/services/import_export/import_export_test.dart b/test/shared/services/import_export/import_export_test.dart index c8a87a312..84c0236c2 100644 --- a/test/shared/services/import_export/import_export_test.dart +++ b/test/shared/services/import_export/import_export_test.dart @@ -1,8 +1,9 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; + import '../../../mock/layers/emoji_layer_mock.dart'; import '../../../mock/layers/paint_layer_mock.dart'; import '../../../mock/layers/text_layer_mock.dart'; diff --git a/test/shared/services/import_export/import_state_history_test.dart b/test/shared/services/import_export/import_state_history_test.dart index 119571782..dc735057e 100644 --- a/test/shared/services/import_export/import_state_history_test.dart +++ b/test/shared/services/import_export/import_state_history_test.dart @@ -2,8 +2,8 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/platform/io/io_helper.dart' show File; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/services/import_export/utils/key_minifier.dart'; diff --git a/test/shared/services/layer_rasterizer/layer_rasterizer_host_test.dart b/test/shared/services/layer_rasterizer/layer_rasterizer_host_test.dart index f3431fc68..ff10ee68e 100644 --- a/test/shared/services/layer_rasterizer/layer_rasterizer_host_test.dart +++ b/test/shared/services/layer_rasterizer/layer_rasterizer_host_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/utils/default_editor_theme.dart'; import 'package:pro_image_editor/shared/widgets/layer/layer_widget.dart'; diff --git a/test/shared/services/layer_rasterizer/layer_rasterizer_test.dart b/test/shared/services/layer_rasterizer/layer_rasterizer_test.dart index f8971b842..5c8f669bc 100644 --- a/test/shared/services/layer_rasterizer/layer_rasterizer_test.dart +++ b/test/shared/services/layer_rasterizer/layer_rasterizer_test.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/widgets/layer/layer_widget.dart'; diff --git a/test/shared/services/layer_transform_generator_test.dart b/test/shared/services/layer_transform_generator_test.dart index 35abefe12..7f738b88e 100644 --- a/test/shared/services/layer_transform_generator_test.dart +++ b/test/shared/services/layer_transform_generator_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/services/layer_transform_generator.dart'; diff --git a/test/shared/styles/platform_text_styles_test.dart b/test/shared/styles/platform_text_styles_test.dart index cc2d21beb..efdaa5874 100644 --- a/test/shared/styles/platform_text_styles_test.dart +++ b/test/shared/styles/platform_text_styles_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/enums/design_mode.dart'; import 'package:pro_image_editor/shared/styles/platform_text_styles.dart'; diff --git a/test/shared/widgets/auto_image_test.dart b/test/shared/widgets/auto_image_test.dart index 435c4c88d..18da3e329 100644 --- a/test/shared/widgets/auto_image_test.dart +++ b/test/shared/widgets/auto_image_test.dart @@ -1,8 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:network_image_mock/network_image_mock.dart'; diff --git a/test/shared/widgets/color_picker/bar_color_picker_test.dart b/test/shared/widgets/color_picker/bar_color_picker_test.dart index bd24f1a38..4758d7f9f 100644 --- a/test/shared/widgets/color_picker/bar_color_picker_test.dart +++ b/test/shared/widgets/color_picker/bar_color_picker_test.dart @@ -1,10 +1,8 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mockito/annotations.dart'; - // Project imports: import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; import 'package:pro_image_editor/shared/widgets/color_picker/bar_color_picker.dart'; diff --git a/test/shared/widgets/layer_widget_test.dart b/test/shared/widgets/layer_widget_test.dart index 4a6b0d716..d4a45e4a1 100644 --- a/test/shared/widgets/layer_widget_test.dart +++ b/test/shared/widgets/layer_widget_test.dart @@ -1,9 +1,7 @@ // Flutter imports: -import 'package:flutter/material.dart'; - // Package imports: import 'package:flutter_test/flutter_test.dart'; - +import 'package:material_ui/material_ui.dart'; // Project imports: import 'package:pro_image_editor/pro_image_editor.dart'; import 'package:pro_image_editor/shared/widgets/layer/layer_widget.dart'; From e717edf318c7104797c556f258dcb8fee1c0b203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B5=D0=BE=D1=80=D0=B3=D0=B8=D0=B9?= Date: Mon, 7 Sep 2026 19:42:38 +0300 Subject: [PATCH 2/5] test: fix Mockito generation and const expressions for Flutter 3.47 --- .../widgets/crop_corner_painter_test.dart | 8 ++++---- .../widgets/color_picker/bar_color_picker_test.dart | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart index fabd963f8..0289d2724 100644 --- a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart +++ b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart @@ -161,7 +161,7 @@ void main() { // Reconstruct the tilted image quad with the same transform the // painter uses, then sample its centroid (clearly inside the image, // outside the crop) and a point far outside the quad. - const center = Offset(imageSize.width / 2, imageSize.height / 2); + final center = Offset(imageSize.width / 2, imageSize.height / 2); final tiltMatrix = Matrix4.identity().tilt( rotate: 0, vertical: 0, @@ -174,9 +174,9 @@ void main() { final corners = [ toScreen(const Offset(0, 0)), - toScreen(const Offset(imageSize.width, 0)), - toScreen(const Offset(imageSize.width, imageSize.height)), - toScreen(const Offset(0, imageSize.height)), + toScreen(Offset(imageSize.width, 0)), + toScreen(Offset(imageSize.width, imageSize.height)), + toScreen(Offset(0, imageSize.height)), ]; final centroid = corners.reduce((a, b) => a + b) / corners.length.toDouble(); diff --git a/test/shared/widgets/color_picker/bar_color_picker_test.dart b/test/shared/widgets/color_picker/bar_color_picker_test.dart index 4758d7f9f..fd0e6a90e 100644 --- a/test/shared/widgets/color_picker/bar_color_picker_test.dart +++ b/test/shared/widgets/color_picker/bar_color_picker_test.dart @@ -3,11 +3,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:material_ui/material_ui.dart'; import 'package:mockito/annotations.dart'; +import 'package:mockito/annotations.dart'; // Project imports: import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; import 'package:pro_image_editor/shared/widgets/color_picker/bar_color_picker.dart'; -@GenerateNiceMocks([MockSpec()]) +@GenerateNiceMocks([ + MockSpec(unsupportedMembers: {#createState}), +]) void main() { group('BarColorPicker Tests', () { testWidgets('Picks color on tap', (WidgetTester tester) async { From 3dcb5872392c3668723344aa639c2ec7ea89fd85 Mon Sep 17 00:00:00 2001 From: hm21 Date: Tue, 8 Sep 2026 10:25:53 +0200 Subject: [PATCH 3/5] fix(ui): resolve analyzer errors and pin the new UI package versions Fix `createState()` returning the private state class in `BarColorPicker` and `LayerWidget`, which broke `flutter analyze` on the generated Mockito mocks and triggered `library_private_types_in_public_api`. Returning `State` again also removes the need for the `unsupportedMembers` workaround in the mock spec. Regenerate the stale Mockito mocks so they reference `material_ui`, drop a duplicate import, and repair the import-section comments that the migration displaced. Pin `material_ui` and `cupertino_ui` instead of `any`, and bump to 14.0.0 since consumers must migrate their own Material and Cupertino imports. --- CHANGELOG.md | 3 + .../lib/features/custom_widgets_example.dart | 1 - example/pubspec.yaml | 4 +- lib/plugins/defer_pointer/defer_pointer.dart | 2 +- .../color_picker/bar_color_picker.dart | 2 +- lib/shared/widgets/layer/layer_widget.dart | 2 +- pubspec.yaml | 6 +- .../widgets/crop_corner_painter_test.dart | 1 - test/models/editor_image_test.dart | 1 - .../shared/widgets/auto_image_test.mocks.dart | 120 +++++++++--- .../color_picker/bar_color_picker_test.dart | 7 +- .../bar_color_picker_test.mocks.dart | 172 +++++++++++++----- 12 files changed, 233 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eb7d367c..ef42e7200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 14.0.0 +- **BREAKING**(ui): Migrate from `package:flutter/material.dart` and `package:flutter/cupertino.dart` to the standalone [`material_ui`](https://pub.dev/packages/material_ui) and [`cupertino_ui`](https://pub.dev/packages/cupertino_ui) packages, which Flutter is decoupling from the SDK. Apps must migrate their own imports as well (`dart fix --apply --code=migrate_design_widgets`), because types such as `ThemeData` are no longer interchangeable with the SDK ones. + ## 13.5.0 - **FEAT**(helper-lines): Add `HelperLineConfigs.enableSmartAlignment` (opt-in) so same-type layers snap matching edges, mixed types snap center to center, and only nearby or shared axes act as guides. Tune the reach via `smartAlignmentNeighborLimit` and `smartAlignmentSharedAxisMin`. - **FEAT**(helper-lines): Add `HelperLineConfigs.enablePaintLayerSnapping` to exclude paint layers from snapping. diff --git a/example/lib/features/custom_widgets_example.dart b/example/lib/features/custom_widgets_example.dart index 5cdfcebb1..a6a5fe494 100644 --- a/example/lib/features/custom_widgets_example.dart +++ b/example/lib/features/custom_widgets_example.dart @@ -3,7 +3,6 @@ import 'dart:math'; // Package imports: import 'package:google_fonts/google_fonts.dart'; -// Flutter imports: import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/pro_image_editor.dart'; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 338d4358f..6b4f3000c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -18,9 +18,11 @@ dependencies: bot_toast: ^4.1.0 cupertino_icons: ^1.0.8 + cupertino_ui: ^1.0.2 file_picker: 10.2.1 gal: ^2.3.2 google_fonts: ^8.0.2 + material_ui: ^1.1.1 file_saver: ^0.3.1 firebase_core: ^4.1.0 firebase_storage: ^13.0.1 @@ -45,8 +47,6 @@ dependencies: media_kit_video: ^1.3.0 # For video rendering. media_kit_libs_video: ^1.0.6 # Native video dependencies. - material_ui: any - cupertino_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/lib/plugins/defer_pointer/defer_pointer.dart b/lib/plugins/defer_pointer/defer_pointer.dart index e99fb271d..2c4a45584 100644 --- a/lib/plugins/defer_pointer/defer_pointer.dart +++ b/lib/plugins/defer_pointer/defer_pointer.dart @@ -3,8 +3,8 @@ import 'dart:collection'; -import 'package:flutter/rendering.dart'; // Flutter imports: +import 'package:flutter/rendering.dart'; import 'package:material_ui/material_ui.dart'; import '/shared/utils/unique_id_generator.dart'; diff --git a/lib/shared/widgets/color_picker/bar_color_picker.dart b/lib/shared/widgets/color_picker/bar_color_picker.dart index c269fcfc0..ce7c02f60 100644 --- a/lib/shared/widgets/color_picker/bar_color_picker.dart +++ b/lib/shared/widgets/color_picker/bar_color_picker.dart @@ -91,7 +91,7 @@ class BarColorPicker extends StatefulWidget { final Duration animationDuration; @override - _BarColorPickerState createState() => _BarColorPickerState(); + State createState() => _BarColorPickerState(); } class _BarColorPickerState extends State diff --git a/lib/shared/widgets/layer/layer_widget.dart b/lib/shared/widgets/layer/layer_widget.dart index b156d846e..69e356a3c 100644 --- a/lib/shared/widgets/layer/layer_widget.dart +++ b/lib/shared/widgets/layer/layer_widget.dart @@ -83,7 +83,7 @@ class LayerWidget extends StatefulWidget with SimpleConfigsAccess { final ValueNotifier? playTimeNotifier; @override - _LayerWidgetState createState() => _LayerWidgetState(); + State createState() => _LayerWidgetState(); } class _LayerWidgetState extends State diff --git a/pubspec.yaml b/pubspec.yaml index 27a346e0c..a0888bd3e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: pro_image_editor description: "A Flutter image editor: Seamlessly enhance your images with user-friendly editing features." -version: 13.5.0 +version: 14.0.0 homepage: https://github.com/hm21/pro_image_editor/ repository: https://github.com/hm21/pro_image_editor/ documentation: https://github.com/hm21/pro_image_editor/ @@ -38,14 +38,14 @@ dependencies: flutter: sdk: flutter + cupertino_ui: ^1.0.2 http: ^1.6.0 + material_ui: ^1.1.1 plugin_platform_interface: ^2.1.8 shared_preferences: ^2.5.4 vector_math: ^2.2.0 web: ^1.1.1 - material_ui: any - cupertino_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart index 0289d2724..1673807ca 100644 --- a/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart +++ b/test/features/crop_rotate_editor/widgets/crop_corner_painter_test.dart @@ -3,7 +3,6 @@ import 'dart:ui' as ui; // Package imports: import 'package:flutter_test/flutter_test.dart'; -// Flutter imports: import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/styles/crop_rotate_editor_style.dart'; import 'package:pro_image_editor/features/crop_rotate_editor/widgets/crop_corner_painter.dart'; diff --git a/test/models/editor_image_test.dart b/test/models/editor_image_test.dart index ccdec602a..108519d2f 100644 --- a/test/models/editor_image_test.dart +++ b/test/models/editor_image_test.dart @@ -3,7 +3,6 @@ import 'dart:typed_data'; // Package imports: import 'package:flutter_test/flutter_test.dart'; -// Flutter imports: import 'package:material_ui/material_ui.dart'; import 'package:pro_image_editor/core/models/editor_image.dart'; import 'package:pro_image_editor/core/platform/io/io_helper.dart'; diff --git a/test/shared/widgets/auto_image_test.mocks.dart b/test/shared/widgets/auto_image_test.mocks.dart index 9d8a6585a..8368805b8 100644 --- a/test/shared/widgets/auto_image_test.mocks.dart +++ b/test/shared/widgets/auto_image_test.mocks.dart @@ -1,44 +1,46 @@ -// Mocks generated by Mockito 5.4.4 from annotations -// in pro_image_editor/test/widgets/auto_image_test.dart. +// Mocks generated by Mockito 5.4.6 from annotations +// in pro_image_editor/test/shared/widgets/auto_image_test.dart. // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes +import 'dart:async' as _i5; +import 'dart:typed_data' as _i4; -// Dart imports: -import 'dart:async' as _i4; -import 'dart:typed_data' as _i3; - -// Flutter imports: -import 'package:flutter/material.dart' as _i5; - -// Package imports: +import 'package:material_ui/material_ui.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; - -// Project imports: -import 'package:pro_image_editor/core/models/editor_image.dart' as _i2; +import 'package:pro_image_editor/core/models/editor_image.dart' as _i3; +import 'package:pro_image_editor/core/platform/io/io_helper.dart' as _i6; // ignore_for_file: type=lint // ignore_for_file: avoid_redundant_argument_values // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references // ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: must_be_immutable // ignore_for_file: prefer_const_constructors // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member + +class _FakeImageProvider_0 extends _i1.SmartFake + implements _i2.ImageProvider { + _FakeImageProvider_0(Object parent, Invocation parentInvocation) + : super(parent, parentInvocation); +} + +class _FakeEditorImage_1 extends _i1.SmartFake implements _i3.EditorImage { + _FakeEditorImage_1(Object parent, Invocation parentInvocation) + : super(parent, parentInvocation); +} /// A class which mocks [EditorImage]. /// /// See the documentation for Mockito's code generation for more information. -class MockEditorImage extends _i1.Mock implements _i2.EditorImage { - @override - set byteArray(_i3.Uint8List? _byteArray) => super.noSuchMethod( - Invocation.setter(#byteArray, _byteArray), - returnValueForMissingStub: null, - ); - +class MockEditorImage extends _i1.Mock implements _i3.EditorImage { @override bool get hasBytes => (super.noSuchMethod( @@ -76,22 +78,82 @@ class MockEditorImage extends _i1.Mock implements _i2.EditorImage { as bool); @override - _i2.EditorImageType get type => + _i3.EditorImageType get type => (super.noSuchMethod( Invocation.getter(#type), - returnValue: _i2.EditorImageType.file, - returnValueForMissingStub: _i2.EditorImageType.file, + returnValue: _i3.EditorImageType.file, + returnValueForMissingStub: _i3.EditorImageType.file, ) - as _i2.EditorImageType); + as _i3.EditorImageType); @override - _i4.Future<_i3.Uint8List> safeByteArray([_i5.BuildContext? context]) => + set byteArray(_i4.Uint8List? value) => super.noSuchMethod( + Invocation.setter(#byteArray, value), + returnValueForMissingStub: null, + ); + + @override + _i2.ImageProvider toImageProvider() => + (super.noSuchMethod( + Invocation.method(#toImageProvider, []), + returnValue: _FakeImageProvider_0( + this, + Invocation.method(#toImageProvider, []), + ), + returnValueForMissingStub: _FakeImageProvider_0( + this, + Invocation.method(#toImageProvider, []), + ), + ) + as _i2.ImageProvider); + + @override + _i5.Future<_i4.Uint8List> safeByteArray([_i2.BuildContext? context]) => (super.noSuchMethod( Invocation.method(#safeByteArray, [context]), - returnValue: _i4.Future<_i3.Uint8List>.value(_i3.Uint8List(0)), - returnValueForMissingStub: _i4.Future<_i3.Uint8List>.value( - _i3.Uint8List(0), + returnValue: _i5.Future<_i4.Uint8List>.value(_i4.Uint8List(0)), + returnValueForMissingStub: _i5.Future<_i4.Uint8List>.value( + _i4.Uint8List(0), + ), + ) + as _i5.Future<_i4.Uint8List>); + + @override + _i3.EditorImage copyWith({ + _i4.Uint8List? byteArray, + _i6.File? file, + String? networkUrl, + Map? networkHeaders, + String? assetPath, + }) => + (super.noSuchMethod( + Invocation.method(#copyWith, [], { + #byteArray: byteArray, + #file: file, + #networkUrl: networkUrl, + #networkHeaders: networkHeaders, + #assetPath: assetPath, + }), + returnValue: _FakeEditorImage_1( + this, + Invocation.method(#copyWith, [], { + #byteArray: byteArray, + #file: file, + #networkUrl: networkUrl, + #networkHeaders: networkHeaders, + #assetPath: assetPath, + }), + ), + returnValueForMissingStub: _FakeEditorImage_1( + this, + Invocation.method(#copyWith, [], { + #byteArray: byteArray, + #file: file, + #networkUrl: networkUrl, + #networkHeaders: networkHeaders, + #assetPath: assetPath, + }), ), ) - as _i4.Future<_i3.Uint8List>); + as _i3.EditorImage); } diff --git a/test/shared/widgets/color_picker/bar_color_picker_test.dart b/test/shared/widgets/color_picker/bar_color_picker_test.dart index fd0e6a90e..19aa2872c 100644 --- a/test/shared/widgets/color_picker/bar_color_picker_test.dart +++ b/test/shared/widgets/color_picker/bar_color_picker_test.dart @@ -1,16 +1,13 @@ -// Flutter imports: // Package imports: import 'package:flutter_test/flutter_test.dart'; import 'package:material_ui/material_ui.dart'; import 'package:mockito/annotations.dart'; -import 'package:mockito/annotations.dart'; + // Project imports: import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart'; import 'package:pro_image_editor/shared/widgets/color_picker/bar_color_picker.dart'; -@GenerateNiceMocks([ - MockSpec(unsupportedMembers: {#createState}), -]) +@GenerateNiceMocks([MockSpec()]) void main() { group('BarColorPicker Tests', () { testWidgets('Picks color on tap', (WidgetTester tester) async { diff --git a/test/shared/widgets/color_picker/bar_color_picker_test.mocks.dart b/test/shared/widgets/color_picker/bar_color_picker_test.mocks.dart index 2dcc3103a..0c9c9cabc 100644 --- a/test/shared/widgets/color_picker/bar_color_picker_test.mocks.dart +++ b/test/shared/widgets/color_picker/bar_color_picker_test.mocks.dart @@ -1,23 +1,16 @@ -// Mocks generated by Mockito 5.4.4 from annotations -// in pro_image_editor/test/widgets/color_picker/bar_color_picker_test.dart. +// Mocks generated by Mockito 5.4.6 from annotations +// in pro_image_editor/test/shared/widgets/color_picker/bar_color_picker_test.dart. // Do not manually edit this file. -// ignore_for_file: no_leading_underscores_for_library_prefixes, must_be_immutable - -// Dart imports: +// ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:ui' as _i2; -// Flutter imports: import 'package:flutter/foundation.dart' as _i5; -import 'package:flutter/material.dart' as _i4; - -// Package imports: +import 'package:material_ui/material_ui.dart' as _i4; import 'package:mockito/mockito.dart' as _i1; import 'package:mockito/src/dummies.dart' as _i8; - -// Project imports: -import 'package:pro_image_editor/pro_image_editor.dart' as _i3; - +import 'package:pro_image_editor/core/models/editor_configs/pro_image_editor_configs.dart' + as _i3; import 'package:pro_image_editor/shared/widgets/color_picker/bar_color_picker.dart' as _i6; import 'package:pro_image_editor/shared/widgets/color_picker/color_picker_configs.dart' @@ -28,12 +21,15 @@ import 'package:pro_image_editor/shared/widgets/color_picker/color_picker_config // ignore_for_file: avoid_setters_without_getters // ignore_for_file: comment_references // ignore_for_file: deprecated_member_use +// ignore_for_file: deprecated_member_use_from_same_package // ignore_for_file: implementation_imports // ignore_for_file: invalid_use_of_visible_for_testing_member +// ignore_for_file: must_be_immutable // ignore_for_file: prefer_const_constructors // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member class _FakeColor_0 extends _i1.SmartFake implements _i2.Color { _FakeColor_0(Object parent, Invocation parentInvocation) @@ -46,35 +42,45 @@ class _FakeProImageEditorConfigs_1 extends _i1.SmartFake : super(parent, parentInvocation); } -class _FakeState_2 extends _i1.SmartFake +class _FakeEdgeInsets_2 extends _i1.SmartFake implements _i4.EdgeInsets { + _FakeEdgeInsets_2(Object parent, Invocation parentInvocation) + : super(parent, parentInvocation); +} + +class _FakeDuration_3 extends _i1.SmartFake implements Duration { + _FakeDuration_3(Object parent, Invocation parentInvocation) + : super(parent, parentInvocation); +} + +class _FakeState_4 extends _i1.SmartFake implements _i4.State { - _FakeState_2(Object parent, Invocation parentInvocation) + _FakeState_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation); @override - String toString({_i4.DiagnosticLevel? minLevel = _i4.DiagnosticLevel.info}) => + String toString({_i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.info}) => super.toString(); } -class _FakeStatefulElement_3 extends _i1.SmartFake +class _FakeStatefulElement_5 extends _i1.SmartFake implements _i4.StatefulElement { - _FakeStatefulElement_3(Object parent, Invocation parentInvocation) + _FakeStatefulElement_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation); @override - String toString({_i4.DiagnosticLevel? minLevel = _i4.DiagnosticLevel.info}) => + String toString({_i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.info}) => super.toString(); } -class _FakeDiagnosticsNode_4 extends _i1.SmartFake - implements _i4.DiagnosticsNode { - _FakeDiagnosticsNode_4(Object parent, Invocation parentInvocation) +class _FakeDiagnosticsNode_6 extends _i1.SmartFake + implements _i5.DiagnosticsNode { + _FakeDiagnosticsNode_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation); @override String toString({ _i5.TextTreeConfiguration? parentConfiguration, - _i4.DiagnosticLevel? minLevel = _i4.DiagnosticLevel.info, + _i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.info, }) => super.toString(); } @@ -151,11 +157,11 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { @override _i2.Color get color => (super.noSuchMethod( - Invocation.getter(#initialColor), - returnValue: _FakeColor_0(this, Invocation.getter(#initialColor)), + Invocation.getter(#color), + returnValue: _FakeColor_0(this, Invocation.getter(#color)), returnValueForMissingStub: _FakeColor_0( this, - Invocation.getter(#initialColor), + Invocation.getter(#color), ), ) as _i2.Color); @@ -176,29 +182,74 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { as _i3.ProImageEditorConfigs); @override - _i4.State<_i4.StatefulWidget> createState() => + bool get showThumb => + (super.noSuchMethod( + Invocation.getter(#showThumb), + returnValue: false, + returnValueForMissingStub: false, + ) + as bool); + + @override + double get borderWidth => + (super.noSuchMethod( + Invocation.getter(#borderWidth), + returnValue: 0.0, + returnValueForMissingStub: 0.0, + ) + as double); + + @override + _i4.EdgeInsets get padding => + (super.noSuchMethod( + Invocation.getter(#padding), + returnValue: _FakeEdgeInsets_2(this, Invocation.getter(#padding)), + returnValueForMissingStub: _FakeEdgeInsets_2( + this, + Invocation.getter(#padding), + ), + ) + as _i4.EdgeInsets); + + @override + Duration get animationDuration => + (super.noSuchMethod( + Invocation.getter(#animationDuration), + returnValue: _FakeDuration_3( + this, + Invocation.getter(#animationDuration), + ), + returnValueForMissingStub: _FakeDuration_3( + this, + Invocation.getter(#animationDuration), + ), + ) + as Duration); + + @override + _i4.State<_i6.BarColorPicker> createState() => (super.noSuchMethod( Invocation.method(#createState, []), - returnValue: _FakeState_2<_i4.StatefulWidget>( + returnValue: _FakeState_4<_i6.BarColorPicker>( this, Invocation.method(#createState, []), ), - returnValueForMissingStub: _FakeState_2<_i4.StatefulWidget>( + returnValueForMissingStub: _FakeState_4<_i6.BarColorPicker>( this, Invocation.method(#createState, []), ), ) - as _i4.State<_i4.StatefulWidget>); + as _i4.State<_i6.BarColorPicker>); @override _i4.StatefulElement createElement() => (super.noSuchMethod( Invocation.method(#createElement, []), - returnValue: _FakeStatefulElement_3( + returnValue: _FakeStatefulElement_5( this, Invocation.method(#createElement, []), ), - returnValueForMissingStub: _FakeStatefulElement_3( + returnValueForMissingStub: _FakeStatefulElement_5( this, Invocation.method(#createElement, []), ), @@ -229,8 +280,8 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { @override String toStringShallow({ - String? joiner = r', ', - _i4.DiagnosticLevel? minLevel = _i4.DiagnosticLevel.debug, + String? joiner = ', ', + _i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.debug, }) => (super.noSuchMethod( Invocation.method(#toStringShallow, [], { @@ -255,7 +306,42 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { as String); @override - _i4.DiagnosticsNode toDiagnosticsNode({ + String toStringDeep({ + String? prefixLineOne = '', + String? prefixOtherLines, + _i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.debug, + int? wrapWidth = 65, + }) => + (super.noSuchMethod( + Invocation.method(#toStringDeep, [], { + #prefixLineOne: prefixLineOne, + #prefixOtherLines: prefixOtherLines, + #minLevel: minLevel, + #wrapWidth: wrapWidth, + }), + returnValue: _i8.dummyValue( + this, + Invocation.method(#toStringDeep, [], { + #prefixLineOne: prefixLineOne, + #prefixOtherLines: prefixOtherLines, + #minLevel: minLevel, + #wrapWidth: wrapWidth, + }), + ), + returnValueForMissingStub: _i8.dummyValue( + this, + Invocation.method(#toStringDeep, [], { + #prefixLineOne: prefixLineOne, + #prefixOtherLines: prefixOtherLines, + #minLevel: minLevel, + #wrapWidth: wrapWidth, + }), + ), + ) + as String); + + @override + _i5.DiagnosticsNode toDiagnosticsNode({ String? name, _i5.DiagnosticsTreeStyle? style, }) => @@ -264,14 +350,14 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { #name: name, #style: style, }), - returnValue: _FakeDiagnosticsNode_4( + returnValue: _FakeDiagnosticsNode_6( this, Invocation.method(#toDiagnosticsNode, [], { #name: name, #style: style, }), ), - returnValueForMissingStub: _FakeDiagnosticsNode_4( + returnValueForMissingStub: _FakeDiagnosticsNode_6( this, Invocation.method(#toDiagnosticsNode, [], { #name: name, @@ -279,18 +365,18 @@ class MockBarColorPicker extends _i1.Mock implements _i6.BarColorPicker { }), ), ) - as _i4.DiagnosticsNode); + as _i5.DiagnosticsNode); @override - List<_i4.DiagnosticsNode> debugDescribeChildren() => + List<_i5.DiagnosticsNode> debugDescribeChildren() => (super.noSuchMethod( Invocation.method(#debugDescribeChildren, []), - returnValue: <_i4.DiagnosticsNode>[], - returnValueForMissingStub: <_i4.DiagnosticsNode>[], + returnValue: <_i5.DiagnosticsNode>[], + returnValueForMissingStub: <_i5.DiagnosticsNode>[], ) - as List<_i4.DiagnosticsNode>); + as List<_i5.DiagnosticsNode>); @override - String toString({_i4.DiagnosticLevel? minLevel = _i4.DiagnosticLevel.info}) => + String toString({_i5.DiagnosticLevel? minLevel = _i5.DiagnosticLevel.info}) => super.toString(); } From 78e14b7dcb64b1a4f4394a350311b044ecfb9993 Mon Sep 17 00:00:00 2001 From: hm21 Date: Tue, 8 Sep 2026 11:23:26 +0200 Subject: [PATCH 4/5] ci: test against Flutter 3.44 and 3.47 CI pinned Flutter 3.44.0 only, so it never exercised the version this migration is for. Run analyze and test as a matrix over both ends of the supported range: 3.44.0, the minimum declared in `environment`, and 3.47, where Material and Cupertino ship as separate packages. Move the format check into its own job so it cannot silently skip when the matrix changes, and build GitHub Pages with 3.47 as well. Bump `actions/checkout` to v5, which runs on Node 24 and drops the Node 20 deprecation warning. --- .github/workflows/flutter_analysis.yml | 40 +++++++++++++++++++++----- .github/workflows/gh_pages.yml | 4 +-- .github/workflows/publish.yml | 2 +- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flutter_analysis.yml b/.github/workflows/flutter_analysis.yml index 2b3c19d47..2dc968611 100644 --- a/.github/workflows/flutter_analysis.yml +++ b/.github/workflows/flutter_analysis.yml @@ -7,27 +7,53 @@ on: workflow_dispatch: jobs: + format: + name: Check formatting + runs-on: ubuntu-latest + + steps: + - name: Clone repository + uses: actions/checkout@v5 + + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + flutter-version: 3.47.x + + - name: Check formatting + run: dart format --output=none --set-exit-if-changed . + package-analysis: + name: Analyze & test (Flutter ${{ matrix.flutter-version }}) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + # Both ends of the supported range. 3.44 is the minimum declared in + # `environment` in pubspec.yaml, and from 3.47 on Flutter ships Material + # and Cupertino as the separate `material_ui` / `cupertino_ui` packages, + # so both need to stay green. + flutter-version: + - 3.44.0 + - 3.47.x + steps: - name: Clone repository - uses: actions/checkout@v4 - + uses: actions/checkout@v5 + - name: Set up Flutter uses: subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.44.0 + flutter-version: ${{ matrix.flutter-version }} - name: Install dependencies run: flutter pub get - - name: Check formatting - run: dart format --output=none --set-exit-if-changed . - - name: Analyze code run: flutter analyze . - name: Run tests - run: flutter test \ No newline at end of file + run: flutter test diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml index 5c4b15ad3..dc99857fe 100644 --- a/.github/workflows/gh_pages.yml +++ b/.github/workflows/gh_pages.yml @@ -11,13 +11,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Clone repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Flutter uses: subosito/flutter-action@v2 with: channel: stable - flutter-version: 3.44.0 + flutter-version: 3.47.x - name: Install Package Dependencies run: flutter pub get diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a86aa793a..c818eb717 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: From d7fb2fed9a247468d250f318312d10439bb611fa Mon Sep 17 00:00:00 2001 From: hm21 Date: Tue, 8 Sep 2026 11:28:15 +0200 Subject: [PATCH 5/5] ci: resolve dependencies before the format check `dart format` reads analysis_options.yaml, whose `include` points at a lint set shipped in a package. Without `flutter pub get` that include fails to resolve, the formatter silently falls back to its defaults and wants to reformat 107 files. --- .github/workflows/flutter_analysis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/flutter_analysis.yml b/.github/workflows/flutter_analysis.yml index 2dc968611..cf13cf8fe 100644 --- a/.github/workflows/flutter_analysis.yml +++ b/.github/workflows/flutter_analysis.yml @@ -21,6 +21,11 @@ jobs: channel: stable flutter-version: 3.47.x + # `dart format` reads analysis_options.yaml, which includes a lint set + # from a package, so the dependencies have to be resolved first. + - name: Install dependencies + run: flutter pub get + - name: Check formatting run: dart format --output=none --set-exit-if-changed .