Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/models/app_tab.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/models/settings.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/about_screen.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home_screen.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/settings_screen.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/services/app_state_service.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/services/certificate_security_service.dart
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/services/derive/cookies_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/services/derive/header_insights.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
8 changes: 5 additions & 3 deletions lib/services/html_service.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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())))
Expand Down
2 changes: 1 addition & 1 deletion lib/services/source_viewer_editor.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/services/unified_sharing_service.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/services/url_history_service.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/analysis_disclaimer.dart
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/block_page_banner.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/browser_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/code_find_panel.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/contextmenu.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/detection_status.dart
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/dom_tree_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/evidence_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/keep_alive_wrapper.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

class KeepAliveWrapper extends StatefulWidget {
final Widget child;
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/media_browser.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/media_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/metadata_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/observed_value.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:material_ui/material_ui.dart';

import '../models/inspection/observed.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/page_size_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/privacy_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/probe_views.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/reader_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/request_timeline_view.dart
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/safe_network_svg.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/score_band_color.dart
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/scroll_through_banner.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/section_box.dart
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/service_logo.dart
Original file line number Diff line number Diff line change
@@ -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];
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/services_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/shared_content_wrapper.dart
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/source_viewer.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/sovereignty_view.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/toolbar.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/url_input.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
29 changes: 29 additions & 0 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/about_page_navigation_test.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion test/auto_theme_switching_test.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/derive/score_band_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/file_viewer_content_type_test.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/inspection/pump.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading
Loading