errorStream() => _errors.stream;
@override
void build() {
@@ -159,9 +155,9 @@ class SandboxCaptureController extends _$SandboxCaptureController {
fmc.SandboxCaptureHostEvents.setUp(_hostEvents);
final dao = ref.read(tabDatabaseProvider).captureTabDao;
- _captureTabSub = dao.watchAll().listen(_onCaptureTabChange);
+ final captureTabSub = dao.watchAll().listen(_onCaptureTabChange);
- _retrySub = ref
+ final retrySub = ref
.read(captureServerProvider)
.retryRequests
.listen(_onRetryRequest);
@@ -173,10 +169,8 @@ class SandboxCaptureController extends _$SandboxCaptureController {
// stream — otherwise an in-flight Pigeon event or DAO emit could
// race with handler cleanup, or _markFailed could try to add to a
// closed _errors sink.
- final captureTabSub = _captureTabSub;
- final retrySub = _retrySub;
- if (captureTabSub != null) unawaited(captureTabSub.cancel());
- if (retrySub != null) unawaited(retrySub.cancel());
+ unawaited(captureTabSub.cancel());
+ unawaited(retrySub.cancel());
fmc.SandboxCaptureHostEvents.setUp(null);
_hostEvents.controller = null;
unawaited(_errors.close());
diff --git a/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.dart b/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.dart
index 657bea3f..b97c065c 100644
--- a/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.dart
+++ b/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.dart
@@ -4,7 +4,6 @@ import 'dart:typed_data';
import 'package:riverpod/riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:search_protocol/search_protocol.dart';
import 'package:search_client/search_client.dart';
import 'package:weblibre/domain/services/generic_website.dart';
import 'package:weblibre/features/search_credits/domain/controllers/search_token_issuance_controller.dart';
@@ -1226,7 +1225,10 @@ class WebSearchScrollOffset extends _$WebSearchScrollOffset {
@override
double build() => 0;
- void update(double offset) => state = offset;
+ void update(double offset) {
+ if (state == offset) return;
+ state = offset;
+ }
void reset() => state = 0;
}
diff --git a/apps/weblibre/lib/features/web_search/domain/services/capture_artifact_downloader.dart b/apps/weblibre/lib/features/web_search/domain/services/capture_artifact_downloader.dart
index 8571801d..b4a27bd1 100644
--- a/apps/weblibre/lib/features/web_search/domain/services/capture_artifact_downloader.dart
+++ b/apps/weblibre/lib/features/web_search/domain/services/capture_artifact_downloader.dart
@@ -5,7 +5,6 @@ import 'dart:ui';
import 'package:http/http.dart' as http;
import 'package:path/path.dart' as p;
import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:search_protocol/search_protocol.dart';
import 'package:search_client/search_client.dart';
import 'package:weblibre/core/filesystem.dart';
import 'package:weblibre/features/search_credits/domain/providers.dart';
diff --git a/apps/weblibre/lib/features/web_search/domain/services/capture_server.dart b/apps/weblibre/lib/features/web_search/domain/services/capture_server.dart
index a4033840..f83e4f7f 100644
--- a/apps/weblibre/lib/features/web_search/domain/services/capture_server.dart
+++ b/apps/weblibre/lib/features/web_search/domain/services/capture_server.dart
@@ -361,14 +361,14 @@ class CaptureServer {
final tabIdJson = jsonEncode(tabId);
final captureIdJson = jsonEncode(captureId);
final html =
- ''
- ''
- 'Capturing…'
- '$body'
- ''
- ''
- '';
+ '''
+
+
+Capturing…
+$body
+
+
+''';
request.response.write(html);
await request.response.close();
}
@@ -510,35 +510,24 @@ class CaptureServer {
"base-uri 'none'; "
"form-action 'self'";
- static const _loaderStyles =
- 'html,body{height:100%}'
- 'body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,'
- 'sans-serif;display:flex;align-items:center;justify-content:center;'
- 'min-height:100vh;margin:0;background:#0b0d10;color:#e6e8eb}'
- 'main{text-align:center;max-width:480px;padding:32px;opacity:0;'
- 'animation:fade .35s ease-out forwards}'
- '@keyframes fade{to{opacity:1}}'
- '.spinner{width:56px;height:56px;margin:0 auto 20px;border-radius:50%;'
- 'border:3px solid rgba(255,255,255,.08);border-top-color:#7aa2f7;'
- 'animation:spin 1s linear infinite}'
- '@keyframes spin{to{transform:rotate(360deg)}}'
- 'h1{font-size:18px;font-weight:600;margin:0 0 8px;letter-spacing:.2px}'
- 'p{margin:0;color:#9aa1a8;font-size:14px;line-height:1.5}'
- '.dots::after{display:inline-block;width:1.2em;text-align:left;'
- 'animation:dots 1.4s steps(4,end) infinite;content:""}'
- '@keyframes dots{0%{content:""}25%{content:"."}50%{content:".."}'
- '75%{content:"..."}100%{content:""}}'
- '.error h1{color:#f7768e}'
- '.actions{margin-top:20px;display:flex;gap:8px;justify-content:center}'
- '.btn{padding:10px 16px;border:0;border-radius:10px;cursor:pointer;'
- 'font:inherit;font-weight:600;background:#7aa2f7;color:#0b0d10}'
- '.btn.secondary{background:transparent;color:#9aa1a8;'
- 'border:1px solid rgba(255,255,255,.12)}'
- '.hidden{display:none}'
- '@media(prefers-color-scheme:light){body{background:#f5f6f8;'
- 'color:#1a1d22}.spinner{border-color:rgba(0,0,0,.08);'
- 'border-top-color:#3b82f6}.btn{background:#3b82f6;color:white}'
- 'p{color:#52606b}}';
+ static const _loaderStyles = '''
+html,body{height:100%}
+body{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#0b0d10;color:#e6e8eb}
+main{text-align:center;max-width:480px;padding:32px;opacity:0;animation:fade .35s ease-out forwards}
+@keyframes fade{to{opacity:1}}
+.spinner{width:56px;height:56px;margin:0 auto 20px;border-radius:50%;border:3px solid rgba(255,255,255,.08);border-top-color:#7aa2f7;animation:spin 1s linear infinite}
+@keyframes spin{to{transform:rotate(360deg)}}
+h1{font-size:18px;font-weight:600;margin:0 0 8px;letter-spacing:.2px}
+p{margin:0;color:#9aa1a8;font-size:14px;line-height:1.5}
+.dots::after{display:inline-block;width:1.2em;text-align:left;animation:dots 1.4s steps(4,end) infinite;content:""}
+@keyframes dots{0%{content:""}25%{content:"."}50%{content:".."}75%{content:"..."}100%{content:""}}
+.error h1{color:#f7768e}
+.actions{margin-top:20px;display:flex;gap:8px;justify-content:center}
+.btn{padding:10px 16px;border:0;border-radius:10px;cursor:pointer;font:inherit;font-weight:600;background:#7aa2f7;color:#0b0d10}
+.btn.secondary{background:transparent;color:#9aa1a8;border:1px solid rgba(255,255,255,.12)}
+.hidden{display:none}
+@media(prefers-color-scheme:light){body{background:#f5f6f8;color:#1a1d22}.spinner{border-color:rgba(0,0,0,.08);border-top-color:#3b82f6}.btn{background:#3b82f6;color:white}p{color:#52606b}}
+''';
// Inline script for the loader shell. Reads window.__TAB_ID__ and
// window.__CAPTURE_ID__, long-polls /loader/wait, then either redirects
@@ -548,7 +537,7 @@ class CaptureServer {
// service has gone away doesn't busy-loop forever — after the cap the
// loader gives up and shows the error pane with a Retry button (which
// resets the counter via showPending → poll()).
- static const _loaderScript = r'''
+ static const _loaderScript = '''
(function(){
var pending=document.getElementById('pending');
var error=document.getElementById('error');
@@ -606,18 +595,19 @@ class CaptureServer {
String _loaderShellBody({required bool initialError}) {
final pendingClass = initialError ? 'hidden' : '';
final errorClass = initialError ? 'error' : 'error hidden';
- return ''
- ''
- 'Capturing page
'
- 'Saving an offline copy. This usually takes a few seconds.
'
- ''
- ''
- 'Capture failed
'
- 'The page could not be saved. Check the notification for details.
'
- ''
- ''
- '
'
- '';
+ return '''
+
+
+Capturing page
+Saving an offline copy. This usually takes a few seconds.
+
+
+Capture failed
+The page could not be saved. Check the notification for details.
+
+
+
+''';
}
}
diff --git a/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_card.dart b/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_card.dart
index ac71ec5d..8a2ce9b2 100644
--- a/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_card.dart
+++ b/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_card.dart
@@ -1,6 +1,5 @@
import 'dart:typed_data';
-import 'package:fast_equatable/fast_equatable.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -211,7 +210,7 @@ class _ContentRow extends StatelessWidget {
/// instances on every state mutation). Equality is driven instead by scalar
/// signatures derived from those collections, which is enough to detect any
/// change a single result card cares about.
-class _FooterState with FastEquatable {
+class _FooterState {
final bool hasOpenSession;
final bool isFetching;
final bool isFetched;
@@ -260,14 +259,26 @@ class _FooterState with FastEquatable {
}
@override
- List get hashParameters => [
+ bool operator ==(Object other) {
+ return identical(this, other) ||
+ other is _FooterState &&
+ hasOpenSession == other.hasOpenSession &&
+ isFetching == other.isFetching &&
+ isFetched == other.isFetched &&
+ fetchError == other.fetchError &&
+ _capturingSignature == other._capturingSignature &&
+ _capturesSignature == other._capturesSignature;
+ }
+
+ @override
+ int get hashCode => Object.hash(
hasOpenSession,
isFetching,
isFetched,
fetchError,
_capturingSignature,
_capturesSignature,
- ];
+ );
}
class _FetchFooter extends ConsumerWidget {
diff --git a/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_metadata_chips.dart b/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_metadata_chips.dart
index c524392c..cb7a7787 100644
--- a/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_metadata_chips.dart
+++ b/apps/weblibre/lib/features/web_search/presentation/widgets/search_result_metadata_chips.dart
@@ -151,10 +151,10 @@ bool _languageMatchesQuery(String resultLanguage, String? queryTag) {
final result = resultLanguage
.trim()
.toLowerCase()
- .split(RegExp(r'[-_]'))
+ .split(RegExp('[-_]'))
.first;
- final query = queryTag.trim().toLowerCase().split(RegExp(r'[-_]')).first;
+ final query = queryTag.trim().toLowerCase().split(RegExp('[-_]')).first;
if (result.isEmpty || query.isEmpty) return false;
diff --git a/apps/weblibre/pubspec.yaml b/apps/weblibre/pubspec.yaml
index 51e278d6..5c587cd3 100644
--- a/apps/weblibre/pubspec.yaml
+++ b/apps/weblibre/pubspec.yaml
@@ -16,7 +16,6 @@ dependencies:
country_codes: ^3.3.0
country_flags: ^4.1.2
crypto: ^3.0.7
- xxh3: ^1.2.0
cryptography_flutter: ^2.3.4
device_info_plus: ^12.4.0
drift: ^2.31.0
@@ -31,15 +30,15 @@ dependencies:
sdk: flutter
flutter_auto_size_text: ^5.0.0
flutter_hooks: ^0.21.3+1
- flutter_secure_storage: ^10.1.0
flutter_markdown: ^0.7.7+1
flutter_material_design_icons: ^3.1.0+7447
flutter_mozilla_components:
path: ../../packages/flutter_mozilla_components
flutter_reorderable_grid_view: ^5.6.0
- flutter_slidable: ^4.0.3
+ flutter_secure_storage: ^10.1.0
flutter_singbox_proxy:
path: ../../packages/flutter_singbox_proxy
+ flutter_slidable: ^4.0.3
flutter_svg: ^2.3.0
flutter_tor:
path: ../../packages/flutter_tor
@@ -67,13 +66,9 @@ dependencies:
path: ^1.9.1
path_provider: ^2.1.5
permission_handler: ^12.0.1
+ pretty_qr_code: ^3.6.0
privacypass_client:
path: ../../../weblibre_account/packages/privacypass_client
- search_client:
- path: ../../../weblibre_account/packages/search_client
- search_protocol:
- path: ../../../weblibre_account/packages/search_protocol
- pretty_qr_code: ^3.6.0
qr_code_scanner_plus: ^2.1.1
quick_actions: ^1.1.0
riverpod: ^3.2.1
@@ -82,6 +77,10 @@ dependencies:
rxdart: ^0.28.0
saf_stream: ^2.0.0
saf_util: ^2.1.0
+ search_client:
+ path: ../../../weblibre_account/packages/search_client
+ search_protocol:
+ path: ../../../weblibre_account/packages/search_protocol
secure_archive:
git:
url: https://github.com/FaFre/secure_archive.git
@@ -97,8 +96,8 @@ dependencies:
speech_to_text_dialog:
path: ../../packages/speech_to_text_dialog
sqlite3: ^2.9.4
- supabase: ^2.10.6
sqlite3_flutter_libs: "0.5.41"
+ supabase: ^2.10.6
synchronized: ^3.4.0+1
text_scroll: ^0.2.1
timeago: ^3.7.1
@@ -106,8 +105,9 @@ dependencies:
git:
url: https://github.com/FaFre/uri-to-file.git
url_launcher: ^6.3.2
- web_socket_channel: ^3.0.3
uuid: ^4.5.3
+ web_socket_channel: ^3.0.3
+ xxh3: ^1.2.0
dev_dependencies:
build_runner: ^2.15.0
diff --git a/apps/weblibre/test/domain/services/generic_website_test.dart b/apps/weblibre/test/domain/services/generic_website_test.dart
index 88a3e94a..959a3de8 100644
--- a/apps/weblibre/test/domain/services/generic_website_test.dart
+++ b/apps/weblibre/test/domain/services/generic_website_test.dart
@@ -1,12 +1,11 @@
-import 'dart:typed_data';
import 'dart:ui';
import 'package:drift/drift.dart' show Variable;
import 'package:drift/native.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:flutter_mozilla_components/src/pigeons/gecko.g.dart';
+import 'package:flutter_test/flutter_test.dart';
import 'package:riverpod/riverpod.dart';
import 'package:weblibre/data/database/functions/lexo_rank_functions.dart';
import 'package:weblibre/domain/services/favicon_resolver.dart';
@@ -222,23 +221,26 @@ final _generatorResult = IconResult(
);
final _cachedSvgBytes = Uint8List.fromList(
- ''
+ '''
+'''
.codeUnits,
);
final _updatedSvgBytes = Uint8List.fromList(
- ''
+ '''
+'''
.codeUnits,
);
final _generatedSvgBytes = Uint8List.fromList(
- ''
+ '''
+'''
.codeUnits,
);
diff --git a/apps/weblibre/test/features/account/presentation/widgets/subscription_card_test.dart b/apps/weblibre/test/features/account/presentation/widgets/subscription_card_test.dart
index e5572c5e..77390d48 100644
--- a/apps/weblibre/test/features/account/presentation/widgets/subscription_card_test.dart
+++ b/apps/weblibre/test/features/account/presentation/widgets/subscription_card_test.dart
@@ -83,19 +83,21 @@ void main() {
tester.binding.handleAppLifecycleStateChanged(AppLifecycleState.resumed);
await tester.pump();
- expect(repository.refreshCount, 1);
+ expect(repository.refreshCount(), 1);
},
);
}
class _FakeSubscriptionRepository extends SubscriptionRepository {
- int refreshCount = 0;
+ int _refreshCount = 0;
+
+ int refreshCount() => _refreshCount;
@override
Future build() async => SubscriptionStatus.inactive;
@override
Future refresh() async {
- refreshCount++;
+ _refreshCount++;
}
}
diff --git a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.dart b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.dart
index 1286b099..9a574a47 100644
--- a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.dart
+++ b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.dart
@@ -18,8 +18,6 @@
* along with this program. If not, see .
*/
-// ignore_for_file: avoid_redundant_argument_values
-
import 'dart:io';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
diff --git a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.mocks.dart b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.mocks.dart
index 6112b7dc..914afa5b 100644
--- a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.mocks.dart
+++ b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_html_utils_test.mocks.dart
@@ -12,7 +12,6 @@ import 'package:mockito/mockito.dart' as _i1;
import 'package:mockito/src/dummies.dart' as _i5;
// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
// ignore_for_file: avoid_setters_without_getters
// ignore_for_file: comment_references
// ignore_for_file: deprecated_member_use
diff --git a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.dart b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.dart
index baa79b10..afabc7dd 100644
--- a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.dart
+++ b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.dart
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-// ignore_for_file: avoid_redundant_argument_values, avoid_dynamic_calls
+// ignore_for_file: avoid_dynamic_calls
import 'dart:convert';
import 'dart:io';
diff --git a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.mocks.dart b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.mocks.dart
index b5a7657a..7e546fba 100644
--- a/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.mocks.dart
+++ b/apps/weblibre/test/features/geckoview/features/bookmarks/utils/bookmark_json_utils_test.mocks.dart
@@ -12,7 +12,6 @@ import 'package:mockito/mockito.dart' as _i1;
import 'package:mockito/src/dummies.dart' as _i5;
// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
// ignore_for_file: avoid_setters_without_getters
// ignore_for_file: comment_references
// ignore_for_file: deprecated_member_use
diff --git a/apps/weblibre/test/features/geckoview/features/browser/domain/services/proxy_settings_replication_test.dart b/apps/weblibre/test/features/geckoview/features/browser/domain/services/proxy_settings_replication_test.dart
index 6a428060..365e6718 100644
--- a/apps/weblibre/test/features/geckoview/features/browser/domain/services/proxy_settings_replication_test.dart
+++ b/apps/weblibre/test/features/geckoview/features/browser/domain/services/proxy_settings_replication_test.dart
@@ -28,7 +28,7 @@ void main() {
test(
'container assignments ensure sing-box profiles are running before syncing',
() async {
- final profileId = SingboxProxyConnectionId('profile-1');
+ const profileId = SingboxProxyConnectionId('profile-1');
final assignedContainer = _container(
id: 'container-1',
contextId: 'context-a',
diff --git a/apps/weblibre/test/features/geckoview/features/open_link_tools/domain/services/url_cleaner_service_test.dart b/apps/weblibre/test/features/geckoview/features/open_link_tools/domain/services/url_cleaner_service_test.dart
index 54ddf26b..dd4766dc 100644
--- a/apps/weblibre/test/features/geckoview/features/open_link_tools/domain/services/url_cleaner_service_test.dart
+++ b/apps/weblibre/test/features/geckoview/features/open_link_tools/domain/services/url_cleaner_service_test.dart
@@ -439,7 +439,6 @@ void main() {
UrlCleanerRule(
name: 'test',
data: UrlCleanerRuleData(
- // ignore: avoid_redundant_argument_values
completeProvider: false,
urlPattern: r'^https?://example\.com',
rules: ['track'],
diff --git a/apps/weblibre/test/features/geckoview/features/tabs/presentation/screens/container_edit_test.dart b/apps/weblibre/test/features/geckoview/features/tabs/presentation/screens/container_edit_test.dart
index ccabd60f..388adb93 100644
--- a/apps/weblibre/test/features/geckoview/features/tabs/presentation/screens/container_edit_test.dart
+++ b/apps/weblibre/test/features/geckoview/features/tabs/presentation/screens/container_edit_test.dart
@@ -24,7 +24,7 @@ void main() {
color: Colors.blue,
orderKey: 'a',
metadata: ContainerMetadata.withDefaults(
- proxyConnectionId: SingboxProxyConnectionId('missing-proxy'),
+ proxyConnectionId: const SingboxProxyConnectionId('missing-proxy'),
),
),
),
diff --git a/apps/weblibre/test/features/proxy/domain/repositories/singbox_proxy_runtime_test.dart b/apps/weblibre/test/features/proxy/domain/repositories/singbox_proxy_runtime_test.dart
index ea0bc9c7..e8075bc1 100644
--- a/apps/weblibre/test/features/proxy/domain/repositories/singbox_proxy_runtime_test.dart
+++ b/apps/weblibre/test/features/proxy/domain/repositories/singbox_proxy_runtime_test.dart
@@ -438,7 +438,7 @@ class _FakeContainerRepository extends ContainerRepository {
class _FakeProxyRoutingSettingsRepository
extends ProxyRoutingSettingsRepository {
- ProxyRoutingSettings? _settings;
+ final ProxyRoutingSettings? _settings;
_FakeProxyRoutingSettingsRepository([this._settings]);
diff --git a/apps/weblibre/test/features/user/data/models/ublock_filter_list_settings_test.dart b/apps/weblibre/test/features/user/data/models/ublock_filter_list_settings_test.dart
index 11d1cd29..8b8a77cc 100644
--- a/apps/weblibre/test/features/user/data/models/ublock_filter_list_settings_test.dart
+++ b/apps/weblibre/test/features/user/data/models/ublock_filter_list_settings_test.dart
@@ -127,16 +127,18 @@ void main() {
test('buildGroupedParentTree creates correct hierarchy', () {
final registry = _makeRegistry();
final tree = registry.buildGroupedParentTree();
+ final defaultGroup = tree[UBlockAssetGroup.$default];
+ final adsGroup = tree[UBlockAssetGroup.ads];
expect(tree, contains(UBlockAssetGroup.$default));
- expect(tree[UBlockAssetGroup.$default]!, contains('uBlock filters'));
+ expect(defaultGroup, contains('uBlock filters'));
expect(
- tree[UBlockAssetGroup.$default]!['uBlock filters'],
+ defaultGroup?['uBlock filters'],
containsAll(['ublock-filters', 'ublock-privacy']),
);
expect(tree, contains(UBlockAssetGroup.ads));
- expect(tree[UBlockAssetGroup.ads]!, contains(null));
- expect(tree[UBlockAssetGroup.ads]![null], contains('easylist'));
+ expect(adsGroup, contains(null));
+ expect(adsGroup?[null], contains('easylist'));
expect(tree, contains(UBlockAssetGroup.regions));
});
diff --git a/apps/weblibre/test/presentation/main_app_test.dart b/apps/weblibre/test/presentation/main_app_test.dart
index 7dd4c01c..f79aaeaa 100644
--- a/apps/weblibre/test/presentation/main_app_test.dart
+++ b/apps/weblibre/test/presentation/main_app_test.dart
@@ -34,7 +34,6 @@ void main() {
);
test('forces animations off when the app setting is enabled', () {
- // ignore: avoid_redundant_argument_values
const mediaQuery = MediaQueryData(disableAnimations: false);
final result = applyAppMediaQueryOverrides(
diff --git a/apps/weblibre/test/presentation/widgets/url_icon_test.dart b/apps/weblibre/test/presentation/widgets/url_icon_test.dart
index 4a33cf32..23c4d38c 100644
--- a/apps/weblibre/test/presentation/widgets/url_icon_test.dart
+++ b/apps/weblibre/test/presentation/widgets/url_icon_test.dart
@@ -3,9 +3,9 @@ import 'dart:typed_data';
import 'package:drift/native.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:flutter_mozilla_components/src/pigeons/gecko.g.dart';
+import 'package:flutter_test/flutter_test.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:weblibre/data/database/functions/lexo_rank_functions.dart';
import 'package:weblibre/domain/services/favicon_resolver.dart';
@@ -128,7 +128,7 @@ void main() {
final class _NeverCalledResolver implements FaviconResolver {
@override
- Future resolve(Uri url, {int? proxyPort}) async {
+ Future resolve(Uri url, {int? proxyPort}) {
throw UnimplementedError('cacheOnly should not hit the resolver');
}
}
diff --git a/packages/flutter_mozilla_components/example/lib/main.dart b/packages/flutter_mozilla_components/example/lib/main.dart
index 00bdf82b..4f0a53e3 100644
--- a/packages/flutter_mozilla_components/example/lib/main.dart
+++ b/packages/flutter_mozilla_components/example/lib/main.dart
@@ -1,8 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
void main() {
- runApp(const MyApp());
+ runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatefulWidget {
diff --git a/packages/flutter_mozilla_components/example/pubspec.yaml b/packages/flutter_mozilla_components/example/pubspec.yaml
index c3699c36..3565f9fc 100644
--- a/packages/flutter_mozilla_components/example/pubspec.yaml
+++ b/packages/flutter_mozilla_components/example/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
flutter_mozilla_components:
path: ../
+ hooks_riverpod: ^3.3.1
dev_dependencies:
flutter_test:
diff --git a/packages/flutter_mozilla_components/lib/flutter_mozilla_components.dart b/packages/flutter_mozilla_components/lib/flutter_mozilla_components.dart
index 41b3caf1..fee6bcdf 100644
--- a/packages/flutter_mozilla_components/lib/flutter_mozilla_components.dart
+++ b/packages/flutter_mozilla_components/lib/flutter_mozilla_components.dart
@@ -69,8 +69,8 @@ export 'src/pigeons/gecko.g.dart'
GeckoDeleteBrowsingDataController,
GeckoEngineSettings,
GeckoFetchResponse,
- GeckoProxySettings,
GeckoPref,
+ GeckoProxySettings,
GeckoPublicSuffixListApi,
GeckoPwaApi,
GeckoSitePermissionsApi,
diff --git a/packages/flutter_singbox_proxy/example/integration_test/plugin_integration_test.dart b/packages/flutter_singbox_proxy/example/integration_test/plugin_integration_test.dart
index 35390277..7fbd021d 100644
--- a/packages/flutter_singbox_proxy/example/integration_test/plugin_integration_test.dart
+++ b/packages/flutter_singbox_proxy/example/integration_test/plugin_integration_test.dart
@@ -6,11 +6,10 @@
// For more information about Flutter integration tests, please see
// https://flutter.dev/to/integration-testing
+import 'package:flutter_singbox_proxy/flutter_singbox_proxy.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
-import 'package:flutter_singbox_proxy/flutter_singbox_proxy.dart';
-
void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
diff --git a/packages/flutter_singbox_proxy/example/lib/main.dart b/packages/flutter_singbox_proxy/example/lib/main.dart
index 149c6879..34d6fff5 100644
--- a/packages/flutter_singbox_proxy/example/lib/main.dart
+++ b/packages/flutter_singbox_proxy/example/lib/main.dart
@@ -1,8 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_singbox_proxy/flutter_singbox_proxy.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
void main() {
- runApp(const MyApp());
+ runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatelessWidget {
diff --git a/packages/flutter_singbox_proxy/example/pubspec.yaml b/packages/flutter_singbox_proxy/example/pubspec.yaml
index 136890e0..a5896ddd 100644
--- a/packages/flutter_singbox_proxy/example/pubspec.yaml
+++ b/packages/flutter_singbox_proxy/example/pubspec.yaml
@@ -15,6 +15,7 @@ environment:
# the latest version available on pub.dev. To see which dependencies have newer
# versions available, run `flutter pub outdated`.
dependencies:
+ cupertino_icons: ^1.0.8
flutter:
sdk: flutter
@@ -25,24 +26,20 @@ dependencies:
# The example app is bundled with the plugin so we use a path dependency on
# the parent directory to use the current plugin's version.
path: ../
-
- # The following adds the Cupertino Icons font to your application.
- # Use with the CupertinoIcons class for iOS style icons.
- cupertino_icons: ^1.0.8
+ hooks_riverpod: ^3.3.1
dev_dependencies:
- integration_test:
- sdk: flutter
+ flutter_lints: ^6.0.0
flutter_test:
sdk: flutter
+ integration_test:
+ sdk: flutter
# The "flutter_lints" package below contains a set of recommended lints to
# encourage good coding practices. The lint set provided by the package is
# activated in the `analysis_options.yaml` file located at the root of your
# package. See that file for information about deactivating specific lint
# rules and activating additional ones.
- flutter_lints: ^6.0.0
-
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/flutter_singbox_proxy/example/test/widget_test.dart b/packages/flutter_singbox_proxy/example/test/widget_test.dart
index ee8663d8..a3d226be 100644
--- a/packages/flutter_singbox_proxy/example/test/widget_test.dart
+++ b/packages/flutter_singbox_proxy/example/test/widget_test.dart
@@ -6,9 +6,8 @@
// tree, read text, and verify that the values of widget properties are correct.
import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
import 'package:flutter_singbox_proxy_example/main.dart';
+import 'package:flutter_test/flutter_test.dart';
void main() {
testWidgets('shows proxy runtime status label', (WidgetTester tester) async {
diff --git a/packages/flutter_singbox_proxy/lib/flutter_singbox_proxy.dart b/packages/flutter_singbox_proxy/lib/flutter_singbox_proxy.dart
index d57a1cfc..1c99e9ef 100644
--- a/packages/flutter_singbox_proxy/lib/flutter_singbox_proxy.dart
+++ b/packages/flutter_singbox_proxy/lib/flutter_singbox_proxy.dart
@@ -1,6 +1,6 @@
import 'dart:async';
-import 'src/singbox_proxy_api.g.dart';
+import 'package:flutter_singbox_proxy/src/singbox_proxy_api.g.dart';
export 'src/singbox_proxy_api.g.dart'
show
diff --git a/packages/flutter_singbox_proxy/test/flutter_singbox_proxy_test.dart b/packages/flutter_singbox_proxy/test/flutter_singbox_proxy_test.dart
index 06aba1bf..25150748 100644
--- a/packages/flutter_singbox_proxy/test/flutter_singbox_proxy_test.dart
+++ b/packages/flutter_singbox_proxy/test/flutter_singbox_proxy_test.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_singbox_proxy/flutter_singbox_proxy.dart';
+import 'package:flutter_test/flutter_test.dart';
void main() {
test('profile model keeps generic sing-box config boundary', () {
diff --git a/packages/flutter_tor/example/lib/main.dart b/packages/flutter_tor/example/lib/main.dart
index cfdfa4b9..2f125739 100644
--- a/packages/flutter_tor/example/lib/main.dart
+++ b/packages/flutter_tor/example/lib/main.dart
@@ -6,10 +6,11 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_tor/flutter_tor.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:socks5_proxy/socks_client.dart';
void main() {
- runApp(const MyApp());
+ runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatelessWidget {
diff --git a/packages/flutter_tor/example/pubspec.yaml b/packages/flutter_tor/example/pubspec.yaml
index 2375a179..54110d20 100644
--- a/packages/flutter_tor/example/pubspec.yaml
+++ b/packages/flutter_tor/example/pubspec.yaml
@@ -19,6 +19,7 @@ dependencies:
sdk: flutter
flutter_tor:
path: ../
+ hooks_riverpod: ^3.3.1
# HTTP client for testing Tor connectivity
http: ^1.6.0
diff --git a/packages/simple_intent_receiver/example/lib/main.dart b/packages/simple_intent_receiver/example/lib/main.dart
index 99e81cf2..96c9b6d2 100644
--- a/packages/simple_intent_receiver/example/lib/main.dart
+++ b/packages/simple_intent_receiver/example/lib/main.dart
@@ -18,6 +18,7 @@
* along with this program. If not, see .
*/
import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:logger/logger.dart';
import 'package:simple_intent_receiver/simple_intent_receiver.dart';
@@ -34,7 +35,7 @@ void main() {
logger.d(data.action);
});
- runApp(const MyApp());
+ runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatelessWidget {
diff --git a/packages/simple_intent_receiver/example/pubspec.yaml b/packages/simple_intent_receiver/example/pubspec.yaml
index 1c2987e4..940eefc8 100644
--- a/packages/simple_intent_receiver/example/pubspec.yaml
+++ b/packages/simple_intent_receiver/example/pubspec.yaml
@@ -17,6 +17,7 @@ environment:
dependencies:
flutter:
sdk: flutter
+ hooks_riverpod: ^3.3.1
logger: ^2.7.0
simple_intent_receiver:
# When depending on this package from a real application you should use:
diff --git a/packages/speech_to_text_dialog/example/lib/main.dart b/packages/speech_to_text_dialog/example/lib/main.dart
index 6aa4fb13..d3cc7975 100644
--- a/packages/speech_to_text_dialog/example/lib/main.dart
+++ b/packages/speech_to_text_dialog/example/lib/main.dart
@@ -1,10 +1,11 @@
import 'dart:async';
import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:speech_to_text_dialog/speech_to_text_dialog.dart';
void main() {
- runApp(const MyApp());
+ runApp(const ProviderScope(child: MyApp()));
}
class MyApp extends StatefulWidget {
diff --git a/packages/speech_to_text_dialog/example/pubspec.yaml b/packages/speech_to_text_dialog/example/pubspec.yaml
index a601bc98..878fdc04 100644
--- a/packages/speech_to_text_dialog/example/pubspec.yaml
+++ b/packages/speech_to_text_dialog/example/pubspec.yaml
@@ -17,6 +17,7 @@ environment:
dependencies:
flutter:
sdk: flutter
+ hooks_riverpod: ^3.3.1
speech_to_text_dialog:
# When depending on this package from a real application you should use: