diff --git a/lib/main.dart b/lib/main.dart index 84e3258..b66c8b2 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 f463100..7fecdcd 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 c14bd49..8a27b2f 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 7a1372b..52ccaf8 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 0769494..a014ff0 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 747d3f3..3a727e6 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 b04f4a0..0a80505 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 cd20578..833d62e 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 018f99f..85a924c 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 240336c..8980d94 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 4826843..9624cda 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 ba4ae8d..b335fb0 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 cb4e7ca..fc4746e 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 9ccb1f7..46aa153 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 3bf7918..b358916 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 5d8640e..8693c2b 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 ccfe6ec..a8164e3 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 b13af92..7833256 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 be3d177..1f72510 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 5c4cd9d..dc480b1 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 2bc2c53..16c76cf 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 81864ca..331f725 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 c262dda..7726990 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 621b127..29927c0 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 d0536ba..8582643 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 4723818..49d9c74 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 c1894cb..5d6b691 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 cc143aa..ba06574 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 42ee7f7..3935b5d 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 f0be7f0..be9ce38 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 057a7be..3efe7df 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 87ce5cd..41f0bf6 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 bf08dd9..2091a8d 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 d1a8090..109397e 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 d195fae..b1d5fbc 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 5fd29da..e675941 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 187428f..f8219b8 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 9dceb8c..70713cf 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 ffc1948..661fe68 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 4a1403d..234483d 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 1157654..89a3a5a 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 a4e7f97..4cba0e9 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 b698eee..df2bd20 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 52c3c14..27add80 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 b1147d3..4335a7a 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 9e86927..5a3b644 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 6648dcb..323fb70 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 7cda810..7e7a039 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 82810a0..e1aa790 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 bcc34e3..437711b 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 a092dae..566a3ef 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 c940033..0487a33 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 43ee5fa..8e52afc 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 5693ea1..eb0e272 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 072a68d..2d7b208 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 66cb0c7..d79b114 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 be2901d..9c9139e 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 604aca3..2f7c262 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 48e479e..56c6fec 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 665a614..6f8e5a0 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 557fc1c..7797e75 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 ad868c3..36a9438 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 9bbfd53..54f3b00 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 2465ef9..408e611 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 6e6acba..77dfc13 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 add35b3..c488a95 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 7e2ac88..46a57e5 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 fdda845..61a3527 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 2c44efc..ff4606d 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 23fe3df..d5a91bb 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 4c2a1d5..9514641 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 d5eac43..45371b0 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 ef34f89..46436db 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 79e0114..bcea569 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 79b3ba8..7c36286 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';