From 190c3d1d5a3da8b5322fe0d06a8cc541ff25c846 Mon Sep 17 00:00:00 2001 From: Wouter van Wijk Date: Sat, 14 Nov 2026 11:47:57 +0100 Subject: [PATCH] Migrate imports from flutter/material and flutter/cupertino to material_ui and cupertino_ui packages Flutter 3.50 deprecates package:flutter/material.dart and package:flutter/cupertino.dart in favor of the standalone official packages material_ui and cupertino_ui. Add both dependencies and replace the imports across lib/, test/ and tooling scripts so flutter analyze reports no issues. Also wrap a bare early-return in a block in html_service.dart to clear the remaining curly_braces lint. Generated by Mistral Vibe. Co-Authored-By: Mistral Vibe --- lib/main.dart | 2 +- lib/models/app_tab.dart | 2 +- lib/models/settings.dart | 2 +- lib/screens/about_screen.dart | 4 +-- lib/screens/home_screen.dart | 2 +- lib/screens/settings_screen.dart | 2 +- lib/services/app_state_service.dart | 2 +- .../certificate_security_service.dart | 2 +- lib/services/derive/cookies_view.dart | 2 +- lib/services/derive/header_insights.dart | 2 +- lib/services/html_service.dart | 8 +++-- lib/services/source_viewer_editor.dart | 2 +- lib/services/unified_sharing_service.dart | 2 +- lib/services/url_history_service.dart | 2 +- lib/widgets/analysis_disclaimer.dart | 2 +- lib/widgets/block_page_banner.dart | 2 +- lib/widgets/browser_view.dart | 2 +- lib/widgets/code_find_panel.dart | 2 +- lib/widgets/contextmenu.dart | 2 +- lib/widgets/detection_status.dart | 2 +- lib/widgets/dom_tree_view.dart | 2 +- lib/widgets/evidence_view.dart | 2 +- lib/widgets/keep_alive_wrapper.dart | 2 +- lib/widgets/media_browser.dart | 2 +- lib/widgets/media_view.dart | 2 +- lib/widgets/metadata_view.dart | 2 +- lib/widgets/observed_value.dart | 2 +- lib/widgets/page_size_view.dart | 2 +- lib/widgets/privacy_view.dart | 2 +- lib/widgets/probe_views.dart | 2 +- lib/widgets/reader_view.dart | 2 +- lib/widgets/request_timeline_view.dart | 2 +- lib/widgets/safe_network_svg.dart | 2 +- lib/widgets/score_band_color.dart | 2 +- lib/widgets/scroll_through_banner.dart | 2 +- lib/widgets/section_box.dart | 2 +- lib/widgets/service_logo.dart | 2 +- lib/widgets/services_view.dart | 2 +- lib/widgets/shared_content_wrapper.dart | 2 +- lib/widgets/source_viewer.dart | 2 +- lib/widgets/sovereignty_view.dart | 2 +- lib/widgets/toolbar.dart | 4 +-- lib/widgets/url_input.dart | 2 +- pubspec.lock | 29 +++++++++++++++++++ pubspec.yaml | 2 ++ test/about_page_navigation_test.dart | 2 +- test/auto_theme_switching_test.dart | 2 +- test/derive/score_band_test.dart | 2 +- test/file_viewer_content_type_test.dart | 2 +- test/fixtures/inspection/pump.dart | 2 +- test/metadata_structured_data_view_test.dart | 2 +- test/sharing_test.dart | 2 +- test/system_theme_test.dart | 2 +- test/tab_functionality_test.dart | 2 +- test/title_navigation_test.dart | 2 +- test/toolbar_icon_test.dart | 4 +-- test/unified_sharing_failure_notice_test.dart | 2 +- test/url_clearing_test.dart | 2 +- test/widgets/block_page_banner_test.dart | 2 +- test/widgets/browser_view_data_test.dart | 2 +- test/widgets/dom_tree_data_test.dart | 2 +- test/widgets/home_screen_data_test.dart | 2 +- test/widgets/location_bar_shortcut_test.dart | 2 +- test/widgets/media_data_test.dart | 2 +- test/widgets/observed_value_test.dart | 2 +- test/widgets/page_size_data_test.dart | 2 +- test/widgets/page_size_estimates_test.dart | 2 +- test/widgets/probe_cookies_data_test.dart | 2 +- test/widgets/probe_general_data_test.dart | 2 +- test/widgets/probe_headers_data_test.dart | 2 +- test/widgets/probe_security_data_test.dart | 2 +- test/widgets/request_timeline_data_test.dart | 2 +- test/widgets/source_viewer_data_test.dart | 2 +- test/widgets/sovereignty_data_test.dart | 2 +- test/widgets/tab_focus_test.dart | 2 +- 75 files changed, 111 insertions(+), 78 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 84e32584..b66c8b2f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; diff --git a/lib/models/app_tab.dart b/lib/models/app_tab.dart index f4631006..7fecdcda 100644 --- a/lib/models/app_tab.dart +++ b/lib/models/app_tab.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The four sections of the tab bar. enum TabGroup { diff --git a/lib/models/settings.dart b/lib/models/settings.dart index c14bd492..8a27b2f6 100644 --- a/lib/models/settings.dart +++ b/lib/models/settings.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:view_source_vibe/services/jurisdiction.dart'; diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dart index 7a1372bb..52ccaf87 100644 --- a/lib/screens/about_screen.dart +++ b/lib/screens/about_screen.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 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:view_source_vibe/services/unified_sharing_service.dart'; import 'package:view_source_vibe/widgets/section_box.dart'; diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 0769494a..a014ff02 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/widgets/analysis_disclaimer.dart'; import 'package:view_source_vibe/widgets/block_page_banner.dart'; import 'package:flutter/services.dart'; diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 747d3f3c..3a727e65 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/settings.dart'; import 'package:view_source_vibe/screens/about_screen.dart'; diff --git a/lib/services/app_state_service.dart b/lib/services/app_state_service.dart index b04f4a03..0a80505a 100644 --- a/lib/services/app_state_service.dart +++ b/lib/services/app_state_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:view_source_vibe/models/html_file.dart'; diff --git a/lib/services/certificate_security_service.dart b/lib/services/certificate_security_service.dart index cd205781..833d62e4 100644 --- a/lib/services/certificate_security_service.dart +++ b/lib/services/certificate_security_service.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/main.dart'; /// Per-session TLS certificate trust handling. diff --git a/lib/services/derive/cookies_view.dart b/lib/services/derive/cookies_view.dart index 018f99f0..85a924c5 100644 --- a/lib/services/derive/cookies_view.dart +++ b/lib/services/derive/cookies_view.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:flutter/material.dart' show IconData, Icons; +import 'package:material_ui/material_ui.dart' show IconData, Icons; import '../../models/inspection/browser_snapshot.dart'; import '../../models/inspection/observed.dart'; diff --git a/lib/services/derive/header_insights.dart b/lib/services/derive/header_insights.dart index 240336cf..8980d949 100644 --- a/lib/services/derive/header_insights.dart +++ b/lib/services/derive/header_insights.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' show IconData, Icons; +import 'package:material_ui/material_ui.dart' show IconData, Icons; import '../../models/inspection/observed.dart'; import '../../models/inspection/page_inspection.dart'; diff --git a/lib/services/html_service.dart b/lib/services/html_service.dart index 48268432..9624cda3 100644 --- a/lib/services/html_service.dart +++ b/lib/services/html_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:view_source_vibe/services/detection/engine.dart'; import 'package:view_source_vibe/models/html_file.dart'; @@ -5442,8 +5442,10 @@ class _ControllerBrowserLoader implements BrowserLoader { @override void loadUrl(Uri url) { final controller = _service.activeWebViewController; - if (controller == null) - return; // still pending; the view loads it on create + if (controller == null) { + // still pending; the view loads it on create + return; + } _service._browserLoadIssuedUrl = url.toString(); controller .loadUrl(urlRequest: URLRequest(url: WebUri(url.toString()))) diff --git a/lib/services/source_viewer_editor.dart b/lib/services/source_viewer_editor.dart index ba4ae8d0..b335fb00 100644 --- a/lib/services/source_viewer_editor.dart +++ b/lib/services/source_viewer_editor.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:re_editor/re_editor.dart'; import 'package:re_highlight/re_highlight.dart'; import 'package:re_highlight/languages/all.dart'; diff --git a/lib/services/unified_sharing_service.dart b/lib/services/unified_sharing_service.dart index cb4e7ca7..fc4746e3 100644 --- a/lib/services/unified_sharing_service.dart +++ b/lib/services/unified_sharing_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:universal_io/io.dart'; diff --git a/lib/services/url_history_service.dart b/lib/services/url_history_service.dart index 9ccb1f71..46aa1536 100644 --- a/lib/services/url_history_service.dart +++ b/lib/services/url_history_service.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; class UrlHistoryService with ChangeNotifier { diff --git a/lib/widgets/analysis_disclaimer.dart b/lib/widgets/analysis_disclaimer.dart index 3bf79186..b3589165 100644 --- a/lib/widgets/analysis_disclaimer.dart +++ b/lib/widgets/analysis_disclaimer.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Footer under the analysis tabs: their results are heuristic. class AnalysisDisclaimer extends StatelessWidget { diff --git a/lib/widgets/block_page_banner.dart b/lib/widgets/block_page_banner.dart index 5d8640e4..8693c2b2 100644 --- a/lib/widgets/block_page_banner.dart +++ b/lib/widgets/block_page_banner.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import '../services/derive/block_page.dart'; diff --git a/lib/widgets/browser_view.dart b/lib/widgets/browser_view.dart index ccfe6ec3..a8164e3c 100644 --- a/lib/widgets/browser_view.dart +++ b/lib/widgets/browser_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:view_source_vibe/models/html_file.dart'; diff --git a/lib/widgets/code_find_panel.dart b/lib/widgets/code_find_panel.dart index b13af92c..78332560 100644 --- a/lib/widgets/code_find_panel.dart +++ b/lib/widgets/code_find_panel.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:re_editor/re_editor.dart'; import 'dart:math'; diff --git a/lib/widgets/contextmenu.dart b/lib/widgets/contextmenu.dart index be3d1772..1f725102 100644 --- a/lib/widgets/contextmenu.dart +++ b/lib/widgets/contextmenu.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:re_editor/re_editor.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/lib/widgets/detection_status.dart b/lib/widgets/detection_status.dart index 5c4cd9dc..dc480b10 100644 --- a/lib/widgets/detection_status.dart +++ b/lib/widgets/detection_status.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/services/derive/detections_view.dart'; /// What a Services/Privacy tab shows when it has no findings: scanning, diff --git a/lib/widgets/dom_tree_view.dart b/lib/widgets/dom_tree_view.dart index 2bc2c533..16c76cf2 100644 --- a/lib/widgets/dom_tree_view.dart +++ b/lib/widgets/dom_tree_view.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/lib/widgets/evidence_view.dart b/lib/widgets/evidence_view.dart index 81864cab..331f7250 100644 --- a/lib/widgets/evidence_view.dart +++ b/lib/widgets/evidence_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/detection_evidence.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/lib/widgets/keep_alive_wrapper.dart b/lib/widgets/keep_alive_wrapper.dart index c262ddaa..77269909 100644 --- a/lib/widgets/keep_alive_wrapper.dart +++ b/lib/widgets/keep_alive_wrapper.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class KeepAliveWrapper extends StatefulWidget { final Widget child; diff --git a/lib/widgets/media_browser.dart b/lib/widgets/media_browser.dart index 621b1279..29927c0d 100644 --- a/lib/widgets/media_browser.dart +++ b/lib/widgets/media_browser.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:view_source_vibe/models/html_file.dart'; import 'package:view_source_vibe/widgets/safe_network_svg.dart'; diff --git a/lib/widgets/media_view.dart b/lib/widgets/media_view.dart index d0536bae..85826438 100644 --- a/lib/widgets/media_view.dart +++ b/lib/widgets/media_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/services/derive/media.dart'; diff --git a/lib/widgets/metadata_view.dart b/lib/widgets/metadata_view.dart index 47238180..49d9c74c 100644 --- a/lib/widgets/metadata_view.dart +++ b/lib/widgets/metadata_view.dart @@ -3,7 +3,7 @@ import 'package:view_source_vibe/widgets/service_logo.dart'; import 'package:view_source_vibe/widgets/evidence_view.dart'; import 'package:view_source_vibe/services/detection/engine.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:html_unescape/html_unescape.dart'; import 'package:provider/provider.dart'; diff --git a/lib/widgets/observed_value.dart b/lib/widgets/observed_value.dart index c1894cb7..5d6b6917 100644 --- a/lib/widgets/observed_value.dart +++ b/lib/widgets/observed_value.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import '../models/inspection/observed.dart'; diff --git a/lib/widgets/page_size_view.dart b/lib/widgets/page_size_view.dart index cc143aaf..ba06574d 100644 --- a/lib/widgets/page_size_view.dart +++ b/lib/widgets/page_size_view.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/page_inspection.dart'; diff --git a/lib/widgets/privacy_view.dart b/lib/widgets/privacy_view.dart index 42ee7f7f..3935b5dc 100644 --- a/lib/widgets/privacy_view.dart +++ b/lib/widgets/privacy_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/services/derive/detections_view.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/lib/widgets/probe_views.dart b/lib/widgets/probe_views.dart index f0be7f0a..be9ce382 100644 --- a/lib/widgets/probe_views.dart +++ b/lib/widgets/probe_views.dart @@ -3,7 +3,7 @@ import 'package:view_source_vibe/widgets/evidence_view.dart'; import 'package:view_source_vibe/models/detection_evidence.dart'; import 'package:view_source_vibe/services/logo_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/lib/widgets/reader_view.dart b/lib/widgets/reader_view.dart index 057a7be4..3efe7df1 100644 --- a/lib/widgets/reader_view.dart +++ b/lib/widgets/reader_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/settings.dart'; diff --git a/lib/widgets/request_timeline_view.dart b/lib/widgets/request_timeline_view.dart index 87ce5cd5..41f0bf64 100644 --- a/lib/widgets/request_timeline_view.dart +++ b/lib/widgets/request_timeline_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/services/derive/probe_general.dart' diff --git a/lib/widgets/safe_network_svg.dart b/lib/widgets/safe_network_svg.dart index bf08dd9c..2091a8d5 100644 --- a/lib/widgets/safe_network_svg.dart +++ b/lib/widgets/safe_network_svg.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:view_source_vibe/services/derive/media.dart'; diff --git a/lib/widgets/score_band_color.dart b/lib/widgets/score_band_color.dart index d1a80906..109397eb 100644 --- a/lib/widgets/score_band_color.dart +++ b/lib/widgets/score_band_color.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/services/derive/score_band.dart'; /// The colour of a score card: the same band as the model's verdict text. diff --git a/lib/widgets/scroll_through_banner.dart b/lib/widgets/scroll_through_banner.dart index d195fae7..b1d5fbcc 100644 --- a/lib/widgets/scroll_through_banner.dart +++ b/lib/widgets/scroll_through_banner.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/lib/widgets/section_box.dart b/lib/widgets/section_box.dart index 5fd29da2..e675941a 100644 --- a/lib/widgets/section_box.dart +++ b/lib/widgets/section_box.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Corner radius shared by the tab chips, group selector and section boxes. const double kUiRadius = 8; diff --git a/lib/widgets/service_logo.dart b/lib/widgets/service_logo.dart index 187428f2..f8219b86 100644 --- a/lib/widgets/service_logo.dart +++ b/lib/widgets/service_logo.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/services/logo_service.dart'; /// Cached logo for a service/tracker, by [domain] or by a name [label]; diff --git a/lib/widgets/services_view.dart b/lib/widgets/services_view.dart index 9dceb8cb..70713cf6 100644 --- a/lib/widgets/services_view.dart +++ b/lib/widgets/services_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/services/derive/detections_view.dart'; diff --git a/lib/widgets/shared_content_wrapper.dart b/lib/widgets/shared_content_wrapper.dart index ffc19484..661fe680 100644 --- a/lib/widgets/shared_content_wrapper.dart +++ b/lib/widgets/shared_content_wrapper.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/services/unified_sharing_service.dart'; /// A wrapper widget that initializes shared content handling when the app starts diff --git a/lib/widgets/source_viewer.dart b/lib/widgets/source_viewer.dart index 4a1403d3..234483d2 100644 --- a/lib/widgets/source_viewer.dart +++ b/lib/widgets/source_viewer.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:re_editor/re_editor.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/lib/widgets/sovereignty_view.dart b/lib/widgets/sovereignty_view.dart index 1157654d..89a3a5ac 100644 --- a/lib/widgets/sovereignty_view.dart +++ b/lib/widgets/sovereignty_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/lib/widgets/toolbar.dart b/lib/widgets/toolbar.dart index a4e7f978..4cba0e92 100644 --- a/lib/widgets/toolbar.dart +++ b/lib/widgets/toolbar.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; +import 'package:material_ui/material_ui.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/services/html_service.dart'; import 'package:view_source_vibe/services/inspection_export_service.dart'; diff --git a/lib/widgets/url_input.dart b/lib/widgets/url_input.dart index b698eeea..df2bd20a 100644 --- a/lib/widgets/url_input.dart +++ b/lib/widgets/url_input.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; diff --git a/pubspec.lock b/pubspec.lock index 52c3c141..27add800 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -233,6 +233,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + cupertino_ui: + dependency: "direct main" + description: + name: cupertino_ui + sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" + url: "https://pub.dev" + source: hosted + version: "1.1.6" dart_style: dependency: transitive description: @@ -437,6 +445,11 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.0" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_svg: dependency: "direct main" description: @@ -537,6 +550,14 @@ packages: description: flutter source: sdk version: "0.0.0" + intl: + dependency: transitive + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" io: dependency: transitive description: @@ -657,6 +678,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e" + url: "https://pub.dev" + source: hosted + version: "1.11.0" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b1147d37..4335a7a9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -60,6 +60,8 @@ dependencies: re_editor: ^0.10.0 re_highlight: ^0.0.3 url_launcher: ^6.3.3 + material_ui: ^1.11.0 + cupertino_ui: ^1.1.6 dev_dependencies: flutter_test: diff --git a/test/about_page_navigation_test.dart b/test/about_page_navigation_test.dart index 9e869276..5a3b6444 100644 --- a/test/about_page_navigation_test.dart +++ b/test/about_page_navigation_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/screens/about_screen.dart'; diff --git a/test/auto_theme_switching_test.dart b/test/auto_theme_switching_test.dart index 6648dcbc..323fb702 100644 --- a/test/auto_theme_switching_test.dart +++ b/test/auto_theme_switching_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:view_source_vibe/models/settings.dart'; diff --git a/test/derive/score_band_test.dart b/test/derive/score_band_test.dart index 7cda8107..7e7a0392 100644 --- a/test/derive/score_band_test.dart +++ b/test/derive/score_band_test.dart @@ -2,7 +2,7 @@ // scale, so they cannot disagree at a boundary. import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/services/derive/score_band.dart'; import 'package:view_source_vibe/widgets/score_band_color.dart'; diff --git a/test/file_viewer_content_type_test.dart b/test/file_viewer_content_type_test.dart index 82810a04..e1aa790e 100644 --- a/test/file_viewer_content_type_test.dart +++ b/test/file_viewer_content_type_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/widgets/source_viewer.dart'; import 'package:view_source_vibe/services/html_service.dart'; import 'package:view_source_vibe/models/html_file.dart'; diff --git a/test/fixtures/inspection/pump.dart b/test/fixtures/inspection/pump.dart index bcc34e32..437711b1 100644 --- a/test/fixtures/inspection/pump.dart +++ b/test/fixtures/inspection/pump.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/html_file.dart'; diff --git a/test/metadata_structured_data_view_test.dart b/test/metadata_structured_data_view_test.dart index a092dae0..566a3ef1 100644 --- a/test/metadata_structured_data_view_test.dart +++ b/test/metadata_structured_data_view_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/html_file.dart'; diff --git a/test/sharing_test.dart b/test/sharing_test.dart index c940033a..0487a33e 100644 --- a/test/sharing_test.dart +++ b/test/sharing_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/services/unified_sharing_service.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/test/system_theme_test.dart b/test/system_theme_test.dart index 43ee5fa2..8e52afc2 100644 --- a/test/system_theme_test.dart +++ b/test/system_theme_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/settings.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { // Initialize Flutter binding for tests diff --git a/test/tab_functionality_test.dart b/test/tab_functionality_test.dart index 5693ea13..eb0e2728 100644 --- a/test/tab_functionality_test.dart +++ b/test/tab_functionality_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:view_source_vibe/services/html_service.dart'; import 'package:view_source_vibe/models/html_file.dart'; import 'package:view_source_vibe/models/settings.dart'; diff --git a/test/title_navigation_test.dart b/test/title_navigation_test.dart index 072a68d5..2d7b208a 100644 --- a/test/title_navigation_test.dart +++ b/test/title_navigation_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/screens/home_screen.dart'; import 'package:view_source_vibe/widgets/url_input.dart'; diff --git a/test/toolbar_icon_test.dart b/test/toolbar_icon_test.dart index 66cb0c75..d79b1141 100644 --- a/test/toolbar_icon_test.dart +++ b/test/toolbar_icon_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; +import 'package:material_ui/material_ui.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:view_source_vibe/widgets/toolbar.dart'; void main() { diff --git a/test/unified_sharing_failure_notice_test.dart b/test/unified_sharing_failure_notice_test.dart index be2901da..9c9139e3 100644 --- a/test/unified_sharing_failure_notice_test.dart +++ b/test/unified_sharing_failure_notice_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/url_clearing_test.dart b/test/url_clearing_test.dart index 604aca37..2f7c2624 100644 --- a/test/url_clearing_test.dart +++ b/test/url_clearing_test.dart @@ -3,7 +3,7 @@ import 'package:view_source_vibe/widgets/url_input.dart'; import 'package:view_source_vibe/services/html_service.dart'; import 'package:view_source_vibe/models/html_file.dart'; import 'package:provider/provider.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; void main() { group('URL Input Clearing Tests', () { diff --git a/test/widgets/block_page_banner_test.dart b/test/widgets/block_page_banner_test.dart index 48e479e2..56c6fec8 100644 --- a/test/widgets/block_page_banner_test.dart +++ b/test/widgets/block_page_banner_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/services/inspection_store.dart'; import 'package:view_source_vibe/widgets/block_page_banner.dart'; diff --git a/test/widgets/browser_view_data_test.dart b/test/widgets/browser_view_data_test.dart index 665a6147..6f8e5a02 100644 --- a/test/widgets/browser_view_data_test.dart +++ b/test/widgets/browser_view_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/test/widgets/dom_tree_data_test.dart b/test/widgets/dom_tree_data_test.dart index 557fc1c5..7797e759 100644 --- a/test/widgets/dom_tree_data_test.dart +++ b/test/widgets/dom_tree_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/widgets/home_screen_data_test.dart b/test/widgets/home_screen_data_test.dart index ad868c3d..36a94384 100644 --- a/test/widgets/home_screen_data_test.dart +++ b/test/widgets/home_screen_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/widgets/location_bar_shortcut_test.dart b/test/widgets/location_bar_shortcut_test.dart index 9bbfd533..54f3b005 100644 --- a/test/widgets/location_bar_shortcut_test.dart +++ b/test/widgets/location_bar_shortcut_test.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; diff --git a/test/widgets/media_data_test.dart b/test/widgets/media_data_test.dart index 2465ef9c..408e6115 100644 --- a/test/widgets/media_data_test.dart +++ b/test/widgets/media_data_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/html_file.dart'; import 'package:view_source_vibe/models/inspection/file_snapshot.dart'; diff --git a/test/widgets/observed_value_test.dart b/test/widgets/observed_value_test.dart index 6e6acba5..77dfc136 100644 --- a/test/widgets/observed_value_test.dart +++ b/test/widgets/observed_value_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/widgets/observed_value.dart'; diff --git a/test/widgets/page_size_data_test.dart b/test/widgets/page_size_data_test.dart index add35b39..c488a950 100644 --- a/test/widgets/page_size_data_test.dart +++ b/test/widgets/page_size_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/browser_snapshot.dart'; diff --git a/test/widgets/page_size_estimates_test.dart b/test/widgets/page_size_estimates_test.dart index 7e2ac887..46a57e55 100644 --- a/test/widgets/page_size_estimates_test.dart +++ b/test/widgets/page_size_estimates_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/services/html_service.dart'; diff --git a/test/widgets/probe_cookies_data_test.dart b/test/widgets/probe_cookies_data_test.dart index fdda8457..61a35277 100644 --- a/test/widgets/probe_cookies_data_test.dart +++ b/test/widgets/probe_cookies_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/page_inspection.dart'; diff --git a/test/widgets/probe_general_data_test.dart b/test/widgets/probe_general_data_test.dart index 2c44efc0..ff4606d1 100644 --- a/test/widgets/probe_general_data_test.dart +++ b/test/widgets/probe_general_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/page_inspection.dart'; diff --git a/test/widgets/probe_headers_data_test.dart b/test/widgets/probe_headers_data_test.dart index 23fe3dfe..d5a91bbf 100644 --- a/test/widgets/probe_headers_data_test.dart +++ b/test/widgets/probe_headers_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/page_inspection.dart'; diff --git a/test/widgets/probe_security_data_test.dart b/test/widgets/probe_security_data_test.dart index 4c2a1d56..9514641f 100644 --- a/test/widgets/probe_security_data_test.dart +++ b/test/widgets/probe_security_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; import 'package:view_source_vibe/models/inspection/page_inspection.dart'; diff --git a/test/widgets/request_timeline_data_test.dart b/test/widgets/request_timeline_data_test.dart index d5eac430..45371b0c 100644 --- a/test/widgets/request_timeline_data_test.dart +++ b/test/widgets/request_timeline_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:view_source_vibe/models/inspection/browser_snapshot.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/test/widgets/source_viewer_data_test.dart b/test/widgets/source_viewer_data_test.dart index ef34f89d..46436dbd 100644 --- a/test/widgets/source_viewer_data_test.dart +++ b/test/widgets/source_viewer_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:re_editor/re_editor.dart'; import 'package:view_source_vibe/models/inspection/browser_snapshot.dart'; diff --git a/test/widgets/sovereignty_data_test.dart b/test/widgets/sovereignty_data_test.dart index 79e01141..bcea569a 100644 --- a/test/widgets/sovereignty_data_test.dart +++ b/test/widgets/sovereignty_data_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; import 'package:view_source_vibe/models/inspection/observed.dart'; diff --git a/test/widgets/tab_focus_test.dart b/test/widgets/tab_focus_test.dart index 79b3ba82..7c362863 100644 --- a/test/widgets/tab_focus_test.dart +++ b/test/widgets/tab_focus_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart';