mainly refactoring & addons

app/lib/features/about/data/repositories/package_info_repository.dart

@@ -1,9 +1,10 @@
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'package_info_repository.g.dart';
 
 @Riverpod(keepAlive: true)
-Future<PackageInfo> packageInfo(PackageInfoRef ref) {
+Future<PackageInfo> packageInfo(Ref ref) {
   return PackageInfo.fromPlatform();
 }

app/lib/features/about/data/repositories/package_info_repository.g.dart

@@ -6,7 +6,7 @@ part of 'package_info_repository.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$packageInfoHash() => r'f7bd90882137aac7a9f28e9d10eae6efeee8c9d0';
+String _$packageInfoHash() => r'cc57db7b4684ab0d5df0f050b8ea045a3658e89a';
 
 /// See also [packageInfo].
 @ProviderFor(packageInfo)
@@ -19,6 +19,8 @@ final packageInfoProvider = FutureProvider<PackageInfo>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef PackageInfoRef = FutureProviderRef<PackageInfo>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/app_widget/domain/services/home_widget.dart

@@ -1,18 +1,19 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:lensai/data/models/received_parameter.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
 
 part 'home_widget.g.dart';
 
 @Riverpod(keepAlive: true)
-FutureOr<bool> widgetPinnable(WidgetPinnableRef ref) async {
+FutureOr<bool> widgetPinnable(Ref ref) async {
   return await HomeWidget.isRequestPinWidgetSupported() ?? false;
 }
 
 @Riverpod()
 Raw<Stream<ReceivedParameter>> appWidgetLaunchStream(
-  AppWidgetLaunchStreamRef ref,
+  Ref ref,
 ) {
   // ignore: discarded_futures
   final initialStream = HomeWidget.initiallyLaunchedFromHomeWidget().asStream();

app/lib/features/app_widget/domain/services/home_widget.g.dart

@@ -6,7 +6,7 @@ part of 'home_widget.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$widgetPinnableHash() => r'c39a8b473a92ff81fa772d7c235b10736e4a49bd';
+String _$widgetPinnableHash() => r'f91041f0f051ad0f00dd765cafea5571ca8c8088';
 
 /// See also [widgetPinnable].
 @ProviderFor(widgetPinnable)
@@ -20,9 +20,11 @@ final widgetPinnableProvider = FutureProvider<bool>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef WidgetPinnableRef = FutureProviderRef<bool>;
 String _$appWidgetLaunchStreamHash() =>
-    r'8c5e21346d492f89f546b4e32135a283719e70e1';
+    r'8eb98d88e74cc4f7573968563c106b8e6beee289';
 
 /// See also [appWidgetLaunchStream].
 @ProviderFor(appWidgetLaunchStream)
@@ -37,7 +39,9 @@ final appWidgetLaunchStreamProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef AppWidgetLaunchStreamRef
     = AutoDisposeProviderRef<Raw<Stream<ReceivedParameter>>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/data/providers.dart

@@ -3,6 +3,7 @@ import 'package:drift/native.dart';
 import 'package:lensai/features/bangs/data/database/database.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart' as path_provider;
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart';
@@ -11,7 +12,7 @@ import 'package:universal_io/io.dart';
 part 'providers.g.dart';
 
 @Riverpod(keepAlive: true)
-BangDatabase bangDatabase(BangDatabaseRef ref) {
+BangDatabase bangDatabase(Ref ref) {
   return BangDatabase(
     LazyDatabase(() async {
       // put the database file, called db.sqlite here, into the documents folder

app/lib/features/bangs/data/providers.g.dart

@@ -6,7 +6,7 @@ part of 'providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$bangDatabaseHash() => r'bbca2edf32faa378dcb6270b12019758d5156662';
+String _$bangDatabaseHash() => r'd7964e9cdbb6e60fb6d2a78f07bfd4fa34bcb236';
 
 /// See also [bangDatabase].
 @ProviderFor(bangDatabase)
@@ -19,6 +19,8 @@ final bangDatabaseProvider = Provider<BangDatabase>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef BangDatabaseRef = ProviderRef<BangDatabase>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/data/services/source.g.dart

@@ -23,4 +23,4 @@ final bangSourceServiceProvider =
 
 typedef _$BangSourceService = AutoDisposeNotifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/domain/providers.dart

@@ -2,31 +2,32 @@ import 'package:lensai/features/bangs/data/models/bang.dart';
 import 'package:lensai/features/bangs/data/models/bang_data.dart';
 import 'package:lensai/features/bangs/domain/repositories/data.dart';
 import 'package:lensai/features/bangs/domain/repositories/sync.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'providers.g.dart';
 
 @Riverpod()
-Stream<BangData?> bangData(BangDataRef ref, String? trigger) {
+Stream<BangData?> bangData(Ref ref, String? trigger) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   return repository.watchBang(trigger);
 }
 
 @Riverpod(keepAlive: true)
-Stream<BangData?> kagiSearchBangData(KagiSearchBangDataRef ref) {
+Stream<BangData?> kagiSearchBangData(Ref ref) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   return repository.watchBang('kagi');
 }
 
 @Riverpod()
-Stream<Map<String, List<String>>> bangCategories(BangCategoriesRef ref) {
+Stream<Map<String, List<String>>> bangCategories(Ref ref) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   return repository.watchCategories();
 }
 
 @Riverpod()
 Stream<List<BangData>> bangDataList(
-  BangDataListRef ref, {
+  Ref ref, {
   ({
     Iterable<BangGroup>? groups,
     String? domain,
@@ -44,14 +45,14 @@ Stream<List<BangData>> bangDataList(
 }
 
 @Riverpod()
-Stream<List<BangData>> frequentBangDataList(FrequentBangDataListRef ref) {
+Stream<List<BangData>> frequentBangDataList(Ref ref) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   return repository.watchFrequentBangs();
 }
 
 @Riverpod()
 Future<BangData> bangDataEnsureIcon(
-  BangDataEnsureIconRef ref,
+  Ref ref,
   BangData bang,
 ) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
@@ -62,7 +63,7 @@ Future<BangData> bangDataEnsureIcon(
 
 @Riverpod()
 Stream<DateTime?> lastSyncOfGroup(
-  LastSyncOfGroupRef ref,
+  Ref ref,
   BangGroup group,
 ) {
   final repository = ref.watch(bangSyncRepositoryProvider.notifier);
@@ -71,7 +72,7 @@ Stream<DateTime?> lastSyncOfGroup(
 
 @Riverpod()
 Stream<int> bangCountOfGroup(
-  BangCountOfGroupRef ref,
+  Ref ref,
   BangGroup group,
 ) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
@@ -79,7 +80,7 @@ Stream<int> bangCountOfGroup(
 }
 
 @Riverpod()
-Stream<double> bangIconCacheSizeMegabytes(BangIconCacheSizeMegabytesRef ref) {
+Stream<double> bangIconCacheSizeMegabytes(Ref ref) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   return repository.watchIconCacheSize();
 }

app/lib/features/bangs/domain/providers.g.dart

@@ -6,7 +6,7 @@ part of 'providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$bangDataHash() => r'd0e96885458be8893c6b19735b8792bdd1b9bcb8';
+String _$bangDataHash() => r'057a002de9789ab74c8f3b337a43faa26b788d8d';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -141,6 +141,8 @@ class BangDataProvider extends AutoDisposeStreamProvider<BangData?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin BangDataRef on AutoDisposeStreamProviderRef<BangData?> {
   /// The parameter `trigger` of this provider.
   String? get trigger;
@@ -155,7 +157,7 @@ class _BangDataProviderElement
 }
 
 String _$kagiSearchBangDataHash() =>
-    r'4dbeaab0541d7c8214d097523d139eede2e3f975';
+    r'0bb5014a7af73ef6f5a36b0545d7a73e7ad0580a';
 
 /// See also [kagiSearchBangData].
 @ProviderFor(kagiSearchBangData)
@@ -169,8 +171,10 @@ final kagiSearchBangDataProvider = StreamProvider<BangData?>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef KagiSearchBangDataRef = StreamProviderRef<BangData?>;
-String _$bangCategoriesHash() => r'dbc63b78208be90c2aa3c3d61b08f98818f4b89d';
+String _$bangCategoriesHash() => r'947fcfd2dffcc7f585c6ed7379d319f4fe72293a';
 
 /// See also [bangCategories].
 @ProviderFor(bangCategories)
@@ -185,9 +189,11 @@ final bangCategoriesProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef BangCategoriesRef
     = AutoDisposeStreamProviderRef<Map<String, List<String>>>;
-String _$bangDataListHash() => r'c4fbc1676be933b29ec88f503110c119fe8b6d86';
+String _$bangDataListHash() => r'cd034fdf046b156ac452edd0857ac054ab477917';
 
 /// See also [bangDataList].
 @ProviderFor(bangDataList)
@@ -317,6 +323,8 @@ class BangDataListProvider extends AutoDisposeStreamProvider<List<BangData>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin BangDataListRef on AutoDisposeStreamProviderRef<List<BangData>> {
   /// The parameter `filter` of this provider.
   ({
@@ -342,7 +350,7 @@ class _BangDataListProviderElement
 }
 
 String _$frequentBangDataListHash() =>
-    r'adf8d0b72adfa8faffadd7f1a294ce3945e22fec';
+    r'27bc10ddf502266458af3910fff09bc8282a8e5c';
 
 /// See also [frequentBangDataList].
 @ProviderFor(frequentBangDataList)
@@ -357,9 +365,11 @@ final frequentBangDataListProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef FrequentBangDataListRef = AutoDisposeStreamProviderRef<List<BangData>>;
 String _$bangDataEnsureIconHash() =>
-    r'69b59b582a7b165b8076a1478d0d433ec0846ccb';
+    r'423b8e92fd89ec328c2fcc8f9e55365c30633fd2';
 
 /// See also [bangDataEnsureIcon].
 @ProviderFor(bangDataEnsureIcon)
@@ -474,6 +484,8 @@ class BangDataEnsureIconProvider extends AutoDisposeFutureProvider<BangData> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin BangDataEnsureIconRef on AutoDisposeFutureProviderRef<BangData> {
   /// The parameter `bang` of this provider.
   BangData get bang;
@@ -488,7 +500,7 @@ class _BangDataEnsureIconProviderElement
   BangData get bang => (origin as BangDataEnsureIconProvider).bang;
 }
 
-String _$lastSyncOfGroupHash() => r'4906dc24970eccda89d94697f98cf70e241ea4ec';
+String _$lastSyncOfGroupHash() => r'23d07f3132ba9bb35a31f74e3a69698d31d4c569';
 
 /// See also [lastSyncOfGroup].
 @ProviderFor(lastSyncOfGroup)
@@ -603,6 +615,8 @@ class LastSyncOfGroupProvider extends AutoDisposeStreamProvider<DateTime?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin LastSyncOfGroupRef on AutoDisposeStreamProviderRef<DateTime?> {
   /// The parameter `group` of this provider.
   BangGroup get group;
@@ -617,7 +631,7 @@ class _LastSyncOfGroupProviderElement
   BangGroup get group => (origin as LastSyncOfGroupProvider).group;
 }
 
-String _$bangCountOfGroupHash() => r'10b363679230c0abf6a6ba7d0be2d0367a7ed215';
+String _$bangCountOfGroupHash() => r'211ffcd7f49b637a7953f913dc5eafda344423f3';
 
 /// See also [bangCountOfGroup].
 @ProviderFor(bangCountOfGroup)
@@ -732,6 +746,8 @@ class BangCountOfGroupProvider extends AutoDisposeStreamProvider<int> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin BangCountOfGroupRef on AutoDisposeStreamProviderRef<int> {
   /// The parameter `group` of this provider.
   BangGroup get group;
@@ -746,7 +762,7 @@ class _BangCountOfGroupProviderElement
 }
 
 String _$bangIconCacheSizeMegabytesHash() =>
-    r'2199439f1b8a2692607231836769a10a24405181';
+    r'e08bfdc7bb47a56c079464478f0b8b5516b2effe';
 
 /// See also [bangIconCacheSizeMegabytes].
 @ProviderFor(bangIconCacheSizeMegabytes)
@@ -761,6 +777,8 @@ final bangIconCacheSizeMegabytesProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef BangIconCacheSizeMegabytesRef = AutoDisposeStreamProviderRef<double>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/domain/repositories/data.g.dart

@@ -24,4 +24,4 @@ final bangDataRepositoryProvider =
 
 typedef _$BangDataRepository = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/domain/repositories/search.g.dart

@@ -22,4 +22,4 @@ final bangSearchProvider =
 
 typedef _$BangSearch = AutoDisposeStreamNotifier<List<BangData>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/bangs/domain/repositories/sync.g.dart

@@ -24,4 +24,4 @@ final bangSyncRepositoryProvider =
 
 typedef _$BangSyncRepository = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/chat_archive/data/providers.dart

@@ -2,6 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:lensai/features/chat_archive/data/database/database.dart';
 import 'package:path_provider/path_provider.dart' as path_provider;
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart';
@@ -10,7 +11,7 @@ import 'package:universal_io/io.dart';
 part 'providers.g.dart';
 
 @Riverpod()
-ChatSearchDatabase chatSearchDatabase(ChatSearchDatabaseRef ref) {
+ChatSearchDatabase chatSearchDatabase(Ref ref) {
   return ChatSearchDatabase(
     LazyDatabase(() async {
       // Also work around limitations on old Android versions

app/lib/features/chat_archive/data/providers.g.dart

@@ -7,7 +7,7 @@ part of 'providers.dart';
 // **************************************************************************
 
 String _$chatSearchDatabaseHash() =>
-    r'd7d2ad34264201d9196b28140b9b0ce0be6b7e1c';
+    r'99700f1a2c25b24742c60fa8dd91fe744dcf21be';
 
 /// See also [chatSearchDatabase].
 @ProviderFor(chatSearchDatabase)
@@ -22,6 +22,8 @@ final chatSearchDatabaseProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef ChatSearchDatabaseRef = AutoDisposeProviderRef<ChatSearchDatabase>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/chat_archive/data/services/file.g.dart

@@ -24,4 +24,4 @@ final chatArchiveFileServiceProvider = AutoDisposeNotifierProvider<
 
 typedef _$ChatArchiveFileService = AutoDisposeNotifier<Raw<Stream<WatchEvent>>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/chat_archive/domain/repositories/archive.dart

@@ -3,6 +3,7 @@ import 'package:lensai/features/chat_archive/data/services/file.dart';
 import 'package:lensai/features/chat_archive/domain/entities/chat_entity.dart';
 import 'package:lensai/features/kagi/data/services/chat.dart';
 import 'package:path/path.dart' as path;
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
 
@@ -62,10 +63,7 @@ class ChatArchiveRepository extends _$ChatArchiveRepository {
 }
 
 @Riverpod()
-Future<String> readArchivedChat(
-  ReadArchivedChatRef ref,
-  String fileName,
-) async {
+Future<String> readArchivedChat(Ref ref, String fileName) async {
   final result =
       await ref.read(chatArchiveRepositoryProvider.notifier).readChat(fileName);
 

app/lib/features/chat_archive/domain/repositories/archive.g.dart

@@ -6,7 +6,7 @@ part of 'archive.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$readArchivedChatHash() => r'e7d646a0ea22fe24d96e97f86c1d46fe83818508';
+String _$readArchivedChatHash() => r'beeadc38cf71f7dfb77a33a1202c685543a72b24';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -142,6 +142,8 @@ class ReadArchivedChatProvider extends AutoDisposeFutureProvider<String> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ReadArchivedChatRef on AutoDisposeFutureProviderRef<String> {
   /// The parameter `fileName` of this provider.
   String get fileName;
@@ -173,4 +175,4 @@ final chatArchiveRepositoryProvider = AutoDisposeStreamNotifierProvider<
 
 typedef _$ChatArchiveRepository = AutoDisposeStreamNotifier<List<ChatEntity>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/chat_archive/domain/repositories/search.g.dart

@@ -25,4 +25,4 @@ final chatArchiveSearchRepositoryProvider = AutoDisposeStreamNotifierProvider<
 typedef _$ChatArchiveSearchRepository
     = AutoDisposeStreamNotifier<List<ChatQueryResult>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/entities/web_extension_state.dart

@@ -0,0 +1,44 @@
+import 'dart:ui';
+
+import 'package:copy_with_extension/copy_with_extension.dart';
+import 'package:fast_equatable/fast_equatable.dart';
+import 'package:lensai/domain/entities/equatable_image.dart';
+
+part 'web_extension_state.g.dart';
+
+@CopyWith()
+class WebExtensionState with FastEquatable {
+  String extensionId;
+
+  String? title;
+  bool enabled;
+  String? badgeText;
+  Color? badgeTextColor;
+  Color? badgeBackgroundColor;
+
+  final EquatableImage? icon;
+
+  WebExtensionState({
+    required this.extensionId,
+    required this.enabled,
+    this.title,
+    this.badgeText,
+    this.badgeTextColor,
+    this.badgeBackgroundColor,
+    this.icon,
+  });
+
+  @override
+  bool get cacheHash => true;
+
+  @override
+  List<Object?> get hashParameters => [
+        extensionId,
+        title,
+        enabled,
+        badgeText,
+        badgeTextColor,
+        badgeBackgroundColor,
+        icon,
+      ];
+}

app/lib/features/geckoview/domain/entities/web_extension_state.g.dart

@@ -0,0 +1,127 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'web_extension_state.dart';
+
+// **************************************************************************
+// CopyWithGenerator
+// **************************************************************************
+
+abstract class _$WebExtensionStateCWProxy {
+  WebExtensionState extensionId(String extensionId);
+
+  WebExtensionState enabled(bool enabled);
+
+  WebExtensionState title(String? title);
+
+  WebExtensionState badgeText(String? badgeText);
+
+  WebExtensionState badgeTextColor(Color? badgeTextColor);
+
+  WebExtensionState badgeBackgroundColor(Color? badgeBackgroundColor);
+
+  WebExtensionState icon(EquatableImage? icon);
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `WebExtensionState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// WebExtensionState(...).copyWith(id: 12, name: "My name")
+  /// ````
+  WebExtensionState call({
+    String? extensionId,
+    bool? enabled,
+    String? title,
+    String? badgeText,
+    Color? badgeTextColor,
+    Color? badgeBackgroundColor,
+    EquatableImage? icon,
+  });
+}
+
+/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfWebExtensionState.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfWebExtensionState.copyWith.fieldName(...)`
+class _$WebExtensionStateCWProxyImpl implements _$WebExtensionStateCWProxy {
+  const _$WebExtensionStateCWProxyImpl(this._value);
+
+  final WebExtensionState _value;
+
+  @override
+  WebExtensionState extensionId(String extensionId) =>
+      this(extensionId: extensionId);
+
+  @override
+  WebExtensionState enabled(bool enabled) => this(enabled: enabled);
+
+  @override
+  WebExtensionState title(String? title) => this(title: title);
+
+  @override
+  WebExtensionState badgeText(String? badgeText) => this(badgeText: badgeText);
+
+  @override
+  WebExtensionState badgeTextColor(Color? badgeTextColor) =>
+      this(badgeTextColor: badgeTextColor);
+
+  @override
+  WebExtensionState badgeBackgroundColor(Color? badgeBackgroundColor) =>
+      this(badgeBackgroundColor: badgeBackgroundColor);
+
+  @override
+  WebExtensionState icon(EquatableImage? icon) => this(icon: icon);
+
+  @override
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `WebExtensionState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// WebExtensionState(...).copyWith(id: 12, name: "My name")
+  /// ````
+  WebExtensionState call({
+    Object? extensionId = const $CopyWithPlaceholder(),
+    Object? enabled = const $CopyWithPlaceholder(),
+    Object? title = const $CopyWithPlaceholder(),
+    Object? badgeText = const $CopyWithPlaceholder(),
+    Object? badgeTextColor = const $CopyWithPlaceholder(),
+    Object? badgeBackgroundColor = const $CopyWithPlaceholder(),
+    Object? icon = const $CopyWithPlaceholder(),
+  }) {
+    return WebExtensionState(
+      extensionId:
+          extensionId == const $CopyWithPlaceholder() || extensionId == null
+              ? _value.extensionId
+              // ignore: cast_nullable_to_non_nullable
+              : extensionId as String,
+      enabled: enabled == const $CopyWithPlaceholder() || enabled == null
+          ? _value.enabled
+          // ignore: cast_nullable_to_non_nullable
+          : enabled as bool,
+      title: title == const $CopyWithPlaceholder()
+          ? _value.title
+          // ignore: cast_nullable_to_non_nullable
+          : title as String?,
+      badgeText: badgeText == const $CopyWithPlaceholder()
+          ? _value.badgeText
+          // ignore: cast_nullable_to_non_nullable
+          : badgeText as String?,
+      badgeTextColor: badgeTextColor == const $CopyWithPlaceholder()
+          ? _value.badgeTextColor
+          // ignore: cast_nullable_to_non_nullable
+          : badgeTextColor as Color?,
+      badgeBackgroundColor: badgeBackgroundColor == const $CopyWithPlaceholder()
+          ? _value.badgeBackgroundColor
+          // ignore: cast_nullable_to_non_nullable
+          : badgeBackgroundColor as Color?,
+      icon: icon == const $CopyWithPlaceholder()
+          ? _value.icon
+          // ignore: cast_nullable_to_non_nullable
+          : icon as EquatableImage?,
+    );
+  }
+}
+
+extension $WebExtensionStateCopyWith on WebExtensionState {
+  /// Returns a callable class that can be used as follows: `instanceOfWebExtensionState.copyWith(...)` or like so:`instanceOfWebExtensionState.copyWith.fieldName(...)`.
+  // ignore: library_private_types_in_public_api
+  _$WebExtensionStateCWProxy get copyWith =>
+      _$WebExtensionStateCWProxyImpl(this);
+}

app/lib/features/geckoview/domain/providers.dart

@@ -5,6 +5,7 @@ import 'package:lensai/core/logger.dart';
 import 'package:lensai/features/bangs/domain/providers.dart';
 import 'package:lensai/features/geckoview/domain/providers/tab_session.dart';
 import 'package:lensai/features/geckoview/domain/repositories/tab.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -13,7 +14,7 @@ part 'providers.g.dart';
 
 @Riverpod(keepAlive: true)
 GeckoSelectionActionService selectionActionService(
-  SelectionActionServiceRef ref,
+  Ref ref,
 ) {
   final service = GeckoSelectionActionService.setUp();
 
@@ -74,7 +75,7 @@ GeckoSelectionActionService selectionActionService(
 }
 
 @Riverpod(keepAlive: true)
-GeckoEventService eventService(EventServiceRef ref) {
+GeckoEventService eventService(Ref ref) {
   final service = GeckoEventService.setUp();
 
   ref.onDispose(() {
@@ -84,6 +85,17 @@ GeckoEventService eventService(EventServiceRef ref) {
   return service;
 }
 
+@Riverpod(keepAlive: true)
+GeckoAddonService addonService(Ref ref) {
+  final service = GeckoAddonService.setUp();
+
+  ref.onDispose(() {
+    service.dispose();
+  });
+
+  return service;
+}
+
 @Riverpod(keepAlive: true)
 class EngineReadyState extends _$EngineReadyState {
   @override
@@ -120,6 +132,6 @@ class EngineReadyState extends _$EngineReadyState {
 }
 
 @Riverpod()
-Raw<TabSession> selectedTabSessionNotifier(SelectedTabSessionNotifierRef ref) {
+Raw<TabSession> selectedTabSessionNotifier(Ref ref) {
   return ref.watch(tabSessionProvider(null).notifier);
 }

app/lib/features/geckoview/domain/providers.g.dart

@@ -7,7 +7,7 @@ part of 'providers.dart';
 // **************************************************************************
 
 String _$selectionActionServiceHash() =>
-    r'c150f6003dcea80b18fc063dd998ab45ce27d1a1';
+    r'b5bc6b2bc5496ae84d61a74cc6ff052b55d2a3d3';
 
 /// See also [selectionActionService].
 @ProviderFor(selectionActionService)
@@ -22,8 +22,10 @@ final selectionActionServiceProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef SelectionActionServiceRef = ProviderRef<GeckoSelectionActionService>;
-String _$eventServiceHash() => r'5aa357fdf0d217677a9a66ecb50417ac18929cad';
+String _$eventServiceHash() => r'166b01f636fbdd4355dbc55a18ca4f83e0006de8';
 
 /// See also [eventService].
 @ProviderFor(eventService)
@@ -36,9 +38,27 @@ final eventServiceProvider = Provider<GeckoEventService>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef EventServiceRef = ProviderRef<GeckoEventService>;
+String _$addonServiceHash() => r'c7aca09b99c3810908176f3464f5f90a185aa5e7';
+
+/// See also [addonService].
+@ProviderFor(addonService)
+final addonServiceProvider = Provider<GeckoAddonService>.internal(
+  addonService,
+  name: r'addonServiceProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$addonServiceHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef AddonServiceRef = ProviderRef<GeckoAddonService>;
 String _$selectedTabSessionNotifierHash() =>
-    r'ea9959e871dd0c3a8b80152eafe726c925094106';
+    r'62fcd98a915566d55b5bcb297d87d675fe12786d';
 
 /// See also [selectedTabSessionNotifier].
 @ProviderFor(selectedTabSessionNotifier)
@@ -53,6 +73,8 @@ final selectedTabSessionNotifierProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef SelectedTabSessionNotifierRef = AutoDisposeProviderRef<Raw<TabSession>>;
 String _$engineReadyStateHash() => r'c682333e2e07cf0635aa7ae793a2088ca648c950';
 
@@ -71,4 +93,4 @@ final engineReadyStateProvider =
 
 typedef _$EngineReadyState = Notifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/selected_tab.g.dart

@@ -21,4 +21,4 @@ final selectedTabProvider = NotifierProvider<SelectedTab, String?>.internal(
 
 typedef _$SelectedTab = Notifier<String?>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/tab_list.dart

@@ -13,6 +13,7 @@ part 'tab_list.g.dart';
 class TabList extends _$TabList {
   late TabDatabase _db;
 
+  @override
   List<String> build() {
     final eventService = ref.watch(eventServiceProvider);
 

app/lib/features/geckoview/domain/providers/tab_list.g.dart

@@ -6,7 +6,7 @@ part of 'tab_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabListHash() => r'fd97d4692b1c74e91c5ebd4a75e6ff45ceb82ef9';
+String _$tabListHash() => r'3c17372cc467736ce1cfba937999acf4de7345ef';
 
 /// See also [TabList].
 @ProviderFor(TabList)
@@ -21,4 +21,4 @@ final tabListProvider = NotifierProvider<TabList, List<String>>.internal(
 
 typedef _$TabList = Notifier<List<String>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/tab_session.dart

@@ -37,8 +37,8 @@ class TabSession extends _$TabSession {
     return _sessionService.exitFullscreen();
   }
 
-  Future<Uint8List?> requestScreenshot() {
-    return _sessionService.requestScreenshot();
+  Future<Uint8List?> requestScreenshot({bool requireImageResult = true}) {
+    return _sessionService.requestScreenshot(requireImageResult);
   }
 
   @override

app/lib/features/geckoview/domain/providers/tab_session.g.dart

@@ -6,7 +6,7 @@ part of 'tab_session.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabSessionHash() => r'29b20f40af01e599ef80e198aec5f093d74efc6a';
+String _$tabSessionHash() => r'42b44a4d47b9a551d002fdbc6337c14b2c327dde';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -155,6 +155,8 @@ class TabSessionProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin TabSessionRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `tabId` of this provider.
   String? get tabId;
@@ -169,4 +171,4 @@ class _TabSessionProviderElement
   String? get tabId => (origin as TabSessionProvider).tabId;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/tab_state.dart

@@ -10,6 +10,7 @@ import 'package:lensai/features/geckoview/domain/entities/tab_state.dart';
 import 'package:lensai/features/geckoview/domain/providers.dart';
 import 'package:lensai/features/geckoview/domain/providers/selected_tab.dart';
 import 'package:lensai/features/geckoview/utils/image_helper.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:synchronized/synchronized.dart';
 
@@ -190,7 +191,7 @@ class TabStates extends _$TabStates {
 }
 
 @Riverpod()
-TabState? tabState(TabStateRef ref, String? tabId) {
+TabState? tabState(Ref ref, String? tabId) {
   if (tabId == null) {
     return null;
   }
@@ -201,7 +202,7 @@ TabState? tabState(TabStateRef ref, String? tabId) {
 }
 
 @Riverpod()
-TabState? selectedTabState(SelectedTabStateRef ref) {
+TabState? selectedTabState(Ref ref) {
   final tabId = ref.watch(selectedTabProvider);
   return ref.watch(tabStateProvider(tabId));
 }

app/lib/features/geckoview/domain/providers/tab_state.g.dart

@@ -6,7 +6,7 @@ part of 'tab_state.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabStateHash() => r'9fd7990804643fac180dd4fd50803bc7c9fa2827';
+String _$tabStateHash() => r'f57b2353acc99ca73670d504b45ea5ff19df38c7';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -141,6 +141,8 @@ class TabStateProvider extends AutoDisposeProvider<TabState?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin TabStateRef on AutoDisposeProviderRef<TabState?> {
   /// The parameter `tabId` of this provider.
   String? get tabId;
@@ -154,7 +156,7 @@ class _TabStateProviderElement extends AutoDisposeProviderElement<TabState?>
   String? get tabId => (origin as TabStateProvider).tabId;
 }
 
-String _$selectedTabStateHash() => r'22172913554e14e67f692eff0777ea015175906e';
+String _$selectedTabStateHash() => r'dbd36af7af286bd9d079f30e8e11bbda23bf7728';
 
 /// See also [selectedTabState].
 @ProviderFor(selectedTabState)
@@ -168,6 +170,8 @@ final selectedTabStateProvider = AutoDisposeProvider<TabState?>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef SelectedTabStateRef = AutoDisposeProviderRef<TabState?>;
 String _$tabStatesHash() => r'dcd293279a901eeaab7728979e39e5ca3bee8c66';
 
@@ -185,4 +189,4 @@ final tabStatesProvider =
 
 typedef _$TabStates = Notifier<Map<String, TabState>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/web_extensions_state.dart

@@ -0,0 +1,107 @@
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:lensai/domain/entities/equatable_image.dart';
+import 'package:lensai/extensions/image.dart';
+import 'package:lensai/features/geckoview/domain/entities/web_extension_state.dart';
+import 'package:lensai/features/geckoview/domain/providers.dart';
+import 'package:lensai/features/geckoview/utils/image_helper.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:synchronized/synchronized.dart';
+
+part 'web_extensions_state.g.dart';
+
+@Riverpod(keepAlive: true)
+class WebExtensionsState extends _$WebExtensionsState {
+  final _imageCache = <String, EquatableImage>{};
+
+  final _lock = Lock();
+
+  void _onExtensionUpdate(ExtensionDataEvent event) {
+    final ExtensionDataEvent(:extensionId, :data) = event;
+
+    if (data != null) {
+      final current = state[extensionId] ??
+          WebExtensionState(
+            extensionId: extensionId,
+            icon: _imageCache[extensionId],
+            enabled: false,
+          );
+
+      state = {...state}..[extensionId] = current.copyWith(
+          title: data.title,
+          enabled: data.enabled,
+          badgeText: data.badgeText,
+          badgeTextColor: (data.badgeTextColor != null)
+              ? Color(data.badgeTextColor!)
+              : null,
+          badgeBackgroundColor: (data.badgeBackgroundColor != null)
+              ? Color(data.badgeBackgroundColor!)
+              : null,
+        );
+    } else {
+      if (state.containsKey(extensionId)) {
+        state = {...state}..remove(extensionId);
+      }
+    }
+  }
+
+  Future<void> _onIconChange(ExtensionIconEvent event) async {
+    final ExtensionIconEvent(:extensionId, :bytes) = event;
+
+    final image =
+        await tryDecodeImage(bytes).then((image) async => image?.toEquatable());
+
+    if (image != null) {
+      if (_imageCache[extensionId] != image) {
+        _imageCache[extensionId] = image;
+
+        if (state.containsKey(extensionId)) {
+          state = {...state}..[extensionId] =
+              state[extensionId]!.copyWith.icon(image);
+        }
+      }
+    }
+  }
+
+  @override
+  Map<String, WebExtensionState> build(WebExtensionActionType actionType) {
+    final addonService = ref.watch(addonServiceProvider);
+
+    final subscriptions = switch (actionType) {
+      WebExtensionActionType.browser => [
+          addonService.browserExtensionStream.listen(
+            (event) async {
+              await _lock.synchronized(() => _onExtensionUpdate(event));
+            },
+          ),
+          addonService.browserIconStream.listen(
+            (event) async {
+              await _lock.synchronized(() => _onIconChange(event));
+            },
+          ),
+        ],
+      WebExtensionActionType.page => [
+          addonService.pageExtensionStream.listen(
+            (event) async {
+              await _lock.synchronized(() => _onExtensionUpdate(event));
+            },
+          ),
+          addonService.pageIconStream.listen(
+            (event) async {
+              await _lock.synchronized(() => _onIconChange(event));
+            },
+          ),
+        ],
+    };
+
+    ref.onDispose(() {
+      for (final sub in subscriptions) {
+        unawaited(sub.cancel());
+      }
+    });
+
+    return {};
+  }
+}

app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart

@@ -0,0 +1,180 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'web_extensions_state.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$webExtensionsStateHash() =>
+    r'9ac102b1d1740d69f9b0de590f08ff0774064845';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$WebExtensionsState
+    extends BuildlessNotifier<Map<String, WebExtensionState>> {
+  late final WebExtensionActionType actionType;
+
+  Map<String, WebExtensionState> build(
+    WebExtensionActionType actionType,
+  );
+}
+
+/// See also [WebExtensionsState].
+@ProviderFor(WebExtensionsState)
+const webExtensionsStateProvider = WebExtensionsStateFamily();
+
+/// See also [WebExtensionsState].
+class WebExtensionsStateFamily extends Family<Map<String, WebExtensionState>> {
+  /// See also [WebExtensionsState].
+  const WebExtensionsStateFamily();
+
+  /// See also [WebExtensionsState].
+  WebExtensionsStateProvider call(
+    WebExtensionActionType actionType,
+  ) {
+    return WebExtensionsStateProvider(
+      actionType,
+    );
+  }
+
+  @override
+  WebExtensionsStateProvider getProviderOverride(
+    covariant WebExtensionsStateProvider provider,
+  ) {
+    return call(
+      provider.actionType,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'webExtensionsStateProvider';
+}
+
+/// See also [WebExtensionsState].
+class WebExtensionsStateProvider extends NotifierProviderImpl<
+    WebExtensionsState, Map<String, WebExtensionState>> {
+  /// See also [WebExtensionsState].
+  WebExtensionsStateProvider(
+    WebExtensionActionType actionType,
+  ) : this._internal(
+          () => WebExtensionsState()..actionType = actionType,
+          from: webExtensionsStateProvider,
+          name: r'webExtensionsStateProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$webExtensionsStateHash,
+          dependencies: WebExtensionsStateFamily._dependencies,
+          allTransitiveDependencies:
+              WebExtensionsStateFamily._allTransitiveDependencies,
+          actionType: actionType,
+        );
+
+  WebExtensionsStateProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.actionType,
+  }) : super.internal();
+
+  final WebExtensionActionType actionType;
+
+  @override
+  Map<String, WebExtensionState> runNotifierBuild(
+    covariant WebExtensionsState notifier,
+  ) {
+    return notifier.build(
+      actionType,
+    );
+  }
+
+  @override
+  Override overrideWith(WebExtensionsState Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: WebExtensionsStateProvider._internal(
+        () => create()..actionType = actionType,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        actionType: actionType,
+      ),
+    );
+  }
+
+  @override
+  NotifierProviderElement<WebExtensionsState, Map<String, WebExtensionState>>
+      createElement() {
+    return _WebExtensionsStateProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is WebExtensionsStateProvider &&
+        other.actionType == actionType;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, actionType.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin WebExtensionsStateRef
+    on NotifierProviderRef<Map<String, WebExtensionState>> {
+  /// The parameter `actionType` of this provider.
+  WebExtensionActionType get actionType;
+}
+
+class _WebExtensionsStateProviderElement extends NotifierProviderElement<
+    WebExtensionsState,
+    Map<String, WebExtensionState>> with WebExtensionsStateRef {
+  _WebExtensionsStateProviderElement(super.provider);
+
+  @override
+  WebExtensionActionType get actionType =>
+      (origin as WebExtensionsStateProvider).actionType;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/repositories/tab.g.dart

@@ -22,4 +22,4 @@ final tabRepositoryProvider = NotifierProvider<TabRepository, void>.internal(
 
 typedef _$TabRepository = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/browser/domain/providers.dart

@@ -7,6 +7,7 @@ import 'package:lensai/features/bangs/domain/repositories/data.dart';
 import 'package:lensai/features/geckoview/domain/providers/tab_list.dart';
 import 'package:lensai/features/geckoview/features/tabs/domain/providers.dart';
 import 'package:lensai/features/kagi/data/entities/modes.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'providers.g.dart';
@@ -28,7 +29,7 @@ class SelectedBangTrigger extends _$SelectedBangTrigger {
 }
 
 @Riverpod()
-Stream<BangData?> selectedBangData(SelectedBangDataRef ref, {String? domain}) {
+Stream<BangData?> selectedBangData(Ref ref, {String? domain}) {
   final repository = ref.watch(bangDataRepositoryProvider.notifier);
   final selectedBangTrigger =
       ref.watch(selectedBangTriggerProvider(domain: domain));
@@ -85,7 +86,7 @@ class ShowFindInPage extends _$ShowFindInPage {
 
 @Riverpod()
 List<String> availableTabIds(
-  AvailableTabIdsRef ref,
+  Ref ref,
   String? containerId,
 ) {
   final containerTabs = ref.watch(

app/lib/features/geckoview/features/browser/domain/providers.g.dart

@@ -6,7 +6,7 @@ part of 'providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$selectedBangDataHash() => r'40dd3c51694394909fe83659ff3e19d51a06ec55';
+String _$selectedBangDataHash() => r'd43e679c40d35c4f4c692ee286dc21789d7287dd';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -142,6 +142,8 @@ class SelectedBangDataProvider extends AutoDisposeStreamProvider<BangData?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SelectedBangDataRef on AutoDisposeStreamProviderRef<BangData?> {
   /// The parameter `domain` of this provider.
   String? get domain;
@@ -156,7 +158,7 @@ class _SelectedBangDataProviderElement
   String? get domain => (origin as SelectedBangDataProvider).domain;
 }
 
-String _$availableTabIdsHash() => r'427ea2e58c6bc27e2f16cffb850dc6621875e247';
+String _$availableTabIdsHash() => r'646d42c747d815496849c7342903caf48258a8ab';
 
 /// See also [availableTabIds].
 @ProviderFor(availableTabIds)
@@ -271,6 +273,8 @@ class AvailableTabIdsProvider extends AutoDisposeProvider<List<String>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin AvailableTabIdsRef on AutoDisposeProviderRef<List<String>> {
   /// The parameter `containerId` of this provider.
   String? get containerId;
@@ -413,6 +417,8 @@ class SelectedBangTriggerProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin SelectedBangTriggerRef on NotifierProviderRef<String?> {
   /// The parameter `domain` of this provider.
   String? get domain;
@@ -493,4 +499,4 @@ final showFindInPageProvider = NotifierProvider<ShowFindInPage, bool>.internal(
 
 typedef _$ShowFindInPage = Notifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/browser/domain/services/create_tab.g.dart

@@ -23,4 +23,4 @@ final createTabStreamProvider =
 
 typedef _$CreateTabStream = AutoDisposeStreamNotifier<CreateTabSheet>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/browser/domain/services/engine_settings.dart

@@ -1,9 +1,10 @@
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'engine_settings.g.dart';
 
 @Riverpod(keepAlive: true)
-GeckoEngineSettingsService engineSettingsService(EngineSettingsServiceRef ref) {
+GeckoEngineSettingsService engineSettingsService(Ref ref) {
   return GeckoEngineSettingsService();
 }

app/lib/features/geckoview/features/browser/domain/services/engine_settings.g.dart

@@ -7,7 +7,7 @@ part of 'engine_settings.dart';
 // **************************************************************************
 
 String _$engineSettingsServiceHash() =>
-    r'9d9abb3601a3782f1f3ef91e31049db40acbf64a';
+    r'051d7b6f65eb5dcb07405b4af1bdadd8dd74fdc0';
 
 /// See also [engineSettingsService].
 @ProviderFor(engineSettingsService)
@@ -22,6 +22,8 @@ final engineSettingsServiceProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef EngineSettingsServiceRef = ProviderRef<GeckoEngineSettingsService>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/browser/presentation/widgets/browser_view.dart

@@ -0,0 +1,133 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:lensai/core/logger.dart';
+import 'package:lensai/features/geckoview/domain/providers.dart';
+import 'package:lensai/features/geckoview/domain/providers/tab_state.dart';
+import 'package:lensai/features/geckoview/domain/providers/web_extensions_state.dart';
+
+class BrowserView extends StatefulHookConsumerWidget {
+  final Duration screenshotPeriod;
+
+  const BrowserView({this.screenshotPeriod = const Duration(seconds: 10)});
+
+  @override
+  ConsumerState<ConsumerStatefulWidget> createState() => _BrowserViewState();
+}
+
+class _BrowserViewState extends ConsumerState<BrowserView>
+    with WidgetsBindingObserver {
+  Timer? _periodicScreenshotUpdate;
+
+  //This is managed by widget state changes to resume a timer
+  bool _timerPaused = false;
+
+  Future<void> _timerTick(Timer timer) async {
+    await ref
+        .read(selectedTabSessionNotifierProvider)
+        .requestScreenshot(requireImageResult: false)
+        .onError((error, stackTrace) {
+      logger.e(error, stackTrace: stackTrace);
+      timer.cancel();
+
+      return null;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ref.listen(
+      selectedTabStateProvider.select(
+        (state) => (tabId: state?.id, isLoading: state?.isLoading),
+      ),
+      (previous, next) {
+        if (previous?.tabId != next.tabId || next.isLoading == true) {
+          _periodicScreenshotUpdate?.cancel();
+          _periodicScreenshotUpdate = null;
+          _timerPaused = false;
+        }
+
+        if (next.isLoading == false &&
+            (_periodicScreenshotUpdate?.isActive ?? false) == false) {
+          _timerPaused = false;
+          _periodicScreenshotUpdate =
+              Timer.periodic(widget.screenshotPeriod, _timerTick);
+        }
+      },
+    );
+
+    return GeckoView(
+      preInitializationStep: () async {
+        await ref
+            .read(eventServiceProvider)
+            .viewReadyStateEvents
+            .firstWhere((state) => state == true)
+            .timeout(
+          const Duration(seconds: 3),
+          onTimeout: () {
+            logger.e(
+              'Browser fragement not reported ready, trying to intitialize anyways',
+            );
+            return true;
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    WidgetsBinding.instance.addObserver(this);
+
+    //Initialize and register dependencies
+    ref.listenManual(
+      selectionActionServiceProvider,
+      (previous, next) {},
+    );
+
+    ref.listenManual(
+      webExtensionsStateProvider(WebExtensionActionType.browser),
+      (previous, next) {},
+    );
+
+    ref.listenManual(
+      webExtensionsStateProvider(WebExtensionActionType.page),
+      (previous, next) {},
+    );
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+
+    switch (state) {
+      case AppLifecycleState.detached:
+      case AppLifecycleState.inactive:
+      case AppLifecycleState.hidden:
+      case AppLifecycleState.paused:
+        if (_periodicScreenshotUpdate?.isActive == true) {
+          _periodicScreenshotUpdate?.cancel();
+          _timerPaused = true;
+        }
+      case AppLifecycleState.resumed:
+        if (_timerPaused) {
+          _periodicScreenshotUpdate =
+              Timer.periodic(widget.screenshotPeriod, _timerTick);
+          _timerPaused = false;
+        }
+    }
+  }
+
+  @override
+  Future<void> dispose() async {
+    WidgetsBinding.instance.removeObserver(this);
+
+    _periodicScreenshotUpdate?.cancel();
+
+    super.dispose();
+  }
+}

app/lib/features/geckoview/features/browser/screens/browser.dart

@@ -6,18 +6,19 @@ import 'package:flutter_material_design_icons/flutter_material_design_icons.dart
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:lensai/core/logger.dart';
 import 'package:lensai/core/routing/routes.dart';
 import 'package:lensai/features/geckoview/domain/providers.dart';
 import 'package:lensai/features/geckoview/domain/providers/tab_list.dart';
 import 'package:lensai/features/geckoview/domain/providers/tab_session.dart';
 import 'package:lensai/features/geckoview/domain/providers/tab_state.dart';
+import 'package:lensai/features/geckoview/domain/providers/web_extensions_state.dart';
 import 'package:lensai/features/geckoview/domain/repositories/tab.dart';
 import 'package:lensai/features/geckoview/features/browser/domain/entities/sheet.dart';
 import 'package:lensai/features/geckoview/features/browser/domain/services/create_tab.dart';
 import 'package:lensai/features/geckoview/features/browser/domain/services/engine_settings.dart';
 import 'package:lensai/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart';
 import 'package:lensai/features/geckoview/features/browser/presentation/widgets/app_bar_title.dart';
+import 'package:lensai/features/geckoview/features/browser/presentation/widgets/browser_view.dart';
 import 'package:lensai/features/geckoview/features/browser/presentation/widgets/sheets/create_tab.dart';
 import 'package:lensai/features/geckoview/features/browser/presentation/widgets/sheets/view_tabs.dart';
 import 'package:lensai/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart';
@@ -219,7 +220,8 @@ class BrowserScreen extends HookConsumerWidget {
                                     onPressed: () {
                                       ref
                                           .read(
-                                              createTabStreamProvider.notifier)
+                                            createTabStreamProvider.notifier,
+                                          )
                                           .createTab(
                                             CreateTabSheet(
                                               preferredTool: KagiTool.assistant,
@@ -278,7 +280,8 @@ class BrowserScreen extends HookConsumerWidget {
                             horizontal: 8.0,
                           ),
                           child: Icon(
-                              quickActionVoice ? Icons.mic : quickAction.icon),
+                            quickActionVoice ? Icons.mic : quickAction.icon,
+                          ),
                         ),
                       ),
                     TabsActionButton(
@@ -310,13 +313,60 @@ class BrowserScreen extends HookConsumerWidget {
                             },
                             child: const Padding(
                               padding: EdgeInsets.symmetric(
-                                  vertical: 15.0, horizontal: 8.0),
+                                vertical: 15.0,
+                                horizontal: 8.0,
+                              ),
                               child: Icon(Icons.more_vert),
                             ),
                           ),
                         );
                       },
                       menuChildren: [
+                        Consumer(
+                          builder: (context, childRef, child) {
+                            final pageExtensions = childRef.watch(
+                              webExtensionsStateProvider(
+                                WebExtensionActionType.page,
+                              ).select((value) => value.values.toList()),
+                            );
+
+                            return Wrap(
+                              alignment: WrapAlignment.center,
+                              children: [
+                                ...pageExtensions.map(
+                                  (extension) => IconButton(
+                                    onPressed: () async {
+                                      //Use parents .ref because after onPressed this consumer gets disposed already
+                                      await ref
+                                          .read(addonServiceProvider)
+                                          .invokeAddonAction(
+                                            extension.extensionId,
+                                            WebExtensionActionType.page,
+                                          );
+                                    },
+                                    icon: Badge(
+                                      isLabelVisible:
+                                          extension.badgeText?.isNotEmpty ??
+                                              false,
+                                      label: (extension.badgeText?.isNotEmpty ==
+                                              true)
+                                          ? Text(extension.badgeText!)
+                                          : null,
+                                      textColor: extension.badgeTextColor,
+                                      backgroundColor:
+                                          extension.badgeBackgroundColor,
+                                      child: RawImage(
+                                        image: extension.icon?.value,
+                                        width: 24,
+                                        height: 24,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            );
+                          },
+                        ),
                         MenuItemButton(
                           onPressed: () async {
                             await context.push(AboutRoute().location);
@@ -332,6 +382,50 @@ class BrowserScreen extends HookConsumerWidget {
                           leadingIcon: const Icon(Icons.settings),
                           child: const Text('Settings'),
                         ),
+                        Consumer(
+                          builder: (context, childRef, child) {
+                            final browserExtensions = childRef.watch(
+                              webExtensionsStateProvider(
+                                WebExtensionActionType.browser,
+                              ).select((value) => value.values.toList()),
+                            );
+
+                            return SubmenuButton(
+                              menuChildren: [
+                                ...browserExtensions.map(
+                                  (extension) => MenuItemButton(
+                                    onPressed: () async {
+                                      //Use parents .ref because after onPressed this consumer gets disposed already
+                                      await ref
+                                          .read(addonServiceProvider)
+                                          .invokeAddonAction(
+                                            extension.extensionId,
+                                            WebExtensionActionType.browser,
+                                          );
+                                    },
+                                    leadingIcon: RawImage(
+                                      image: extension.icon?.value,
+                                      width: 24,
+                                      height: 24,
+                                    ),
+                                    child: Text(extension.title ?? ''),
+                                  ),
+                                ),
+                                MenuItemButton(
+                                  onPressed: () async {
+                                    await childRef
+                                        .read(addonServiceProvider)
+                                        .startAddonManagerActivity();
+                                  },
+                                  leadingIcon: const Icon(MdiIcons.puzzleEdit),
+                                  child: const Text('Addon Manager'),
+                                ),
+                              ],
+                              leadingIcon: const Icon(MdiIcons.puzzle),
+                              child: const Text('Addons'),
+                            );
+                          },
+                        ),
                         const Divider(),
                         MenuItemButton(
                           onPressed: () async {
@@ -340,53 +434,56 @@ class BrowserScreen extends HookConsumerWidget {
                           leadingIcon: const Icon(MdiIcons.exclamationThick),
                           child: const Text('Bangs'),
                         ),
-                        if (showEarlyAccessFeatures)
-                          MenuItemButton(
-                            onPressed: () async {
-                              await context
-                                  .push(ChatArchiveListRoute().location);
-                            },
-                            leadingIcon: const Icon(MdiIcons.archive),
-                            child: const Text('Chat Archive'),
-                          ),
-                        const Divider(),
-                        if (showEarlyAccessFeatures)
-                          MenuItemButton(
-                            onPressed: () {
-                              ref
-                                  .read(createTabStreamProvider.notifier)
-                                  .createTab(
-                                    CreateTabSheet(
-                                        preferredTool: KagiTool.assistant),
-                                  );
-                            },
-                            leadingIcon: Icon(KagiTool.assistant.icon),
-                            child: const Text('Assistant'),
-                          ),
-                        MenuItemButton(
-                          onPressed: () {
-                            ref
-                                .read(createTabStreamProvider.notifier)
-                                .createTab(
-                                  CreateTabSheet(
-                                      preferredTool: KagiTool.summarizer),
-                                );
-                          },
-                          leadingIcon: Icon(KagiTool.summarizer.icon),
-                          child: const Text('Summarizer'),
-                        ),
-                        MenuItemButton(
-                          onPressed: () {
-                            ref
-                                .read(createTabStreamProvider.notifier)
-                                .createTab(
-                                  CreateTabSheet(
-                                      preferredTool: KagiTool.search),
-                                );
-                          },
-                          leadingIcon: Icon(KagiTool.search.icon),
-                          child: const Text('Search'),
-                        ),
+                        // if (showEarlyAccessFeatures)
+                        //   MenuItemButton(
+                        //     onPressed: () async {
+                        //       await context
+                        //           .push(ChatArchiveListRoute().location);
+                        //     },
+                        //     leadingIcon: const Icon(MdiIcons.archive),
+                        //     child: const Text('Chat Archive'),
+                        //   ),
+                        // const Divider(),
+                        // if (showEarlyAccessFeatures)
+                        //   MenuItemButton(
+                        //     onPressed: () {
+                        //       ref
+                        //           .read(createTabStreamProvider.notifier)
+                        //           .createTab(
+                        //             CreateTabSheet(
+                        //               preferredTool: KagiTool.assistant,
+                        //             ),
+                        //           );
+                        //     },
+                        //     leadingIcon: Icon(KagiTool.assistant.icon),
+                        //     child: const Text('Assistant'),
+                        //   ),
+                        // MenuItemButton(
+                        //   onPressed: () {
+                        //     ref
+                        //         .read(createTabStreamProvider.notifier)
+                        //         .createTab(
+                        //           CreateTabSheet(
+                        //             preferredTool: KagiTool.summarizer,
+                        //           ),
+                        //         );
+                        //   },
+                        //   leadingIcon: Icon(KagiTool.summarizer.icon),
+                        //   child: const Text('Summarizer'),
+                        // ),
+                        // MenuItemButton(
+                        //   onPressed: () {
+                        //     ref
+                        //         .read(createTabStreamProvider.notifier)
+                        //         .createTab(
+                        //           CreateTabSheet(
+                        //             preferredTool: KagiTool.search,
+                        //           ),
+                        //         );
+                        //   },
+                        //   leadingIcon: Icon(KagiTool.search.icon),
+                        //   child: const Text('Search'),
+                        // ),
                         const Divider(),
                         if (selectedTabId != null)
                           MenuItemButton(
@@ -419,8 +516,10 @@ class BrowserScreen extends HookConsumerWidget {
                           MenuItemButton(
                             onPressed: () {
                               ref
-                                  .read(findInPageVisibilityControllerProvider
-                                      .notifier)
+                                  .read(
+                                    findInPageVisibilityControllerProvider
+                                        .notifier,
+                                  )
                                   .show();
                             },
                             leadingIcon: const Icon(Icons.search),
@@ -431,7 +530,8 @@ class BrowserScreen extends HookConsumerWidget {
                           MenuItemButton(
                             onPressed: () async {
                               final controller = ref.read(
-                                  tabSessionProvider(selectedTabId).notifier);
+                                tabSessionProvider(selectedTabId).notifier,
+                              );
 
                               await controller.reload();
                               menuController.close();
@@ -479,7 +579,9 @@ class BrowserScreen extends HookConsumerWidget {
                                           ),
                                   ),
                                   const SizedBox(
-                                      height: 48, child: VerticalDivider()),
+                                    height: 48,
+                                    child: VerticalDivider(),
+                                  ),
                                   Expanded(
                                     child: IconButton(
                                       onPressed: (history?.canGoForward == true)
@@ -607,30 +709,7 @@ class BrowserScreen extends HookConsumerWidget {
                       SafeArea(
                         child: Stack(
                           children: [
-                            Consumer(
-                              builder: (context, ref, child) {
-                                //Initialize dependencies
-                                ref.watch(selectionActionServiceProvider);
-
-                                return GeckoView(
-                                  preInitializationStep: () async {
-                                    await ref
-                                        .read(eventServiceProvider)
-                                        .viewReadyStateEvents
-                                        .firstWhere((state) => state == true)
-                                        .timeout(
-                                      const Duration(seconds: 3),
-                                      onTimeout: () {
-                                        logger.e(
-                                          'Browser fragement not reported ready, trying to intitialize anyways',
-                                        );
-                                        return true;
-                                      },
-                                    );
-                                  },
-                                );
-                              },
-                            ),
+                            const BrowserView(),
                             Positioned(
                               bottom: 0,
                               left: 0,

app/lib/features/geckoview/features/controllers/bottom_sheet.g.dart

@@ -40,4 +40,4 @@ final bottomSheetExtendProvider =
 
 typedef _$BottomSheetExtend = StreamNotifier<double>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/controllers/overlay_dialog.g.dart

@@ -24,4 +24,4 @@ final overlayDialogControllerProvider =
 
 typedef _$OverlayDialogController = AutoDisposeNotifier<Widget?>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart

@@ -158,6 +158,8 @@ class FindInPageRepositoryProvider
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin FindInPageRepositoryRef on AutoDisposeNotifierProviderRef<void> {
   /// The parameter `tabId` of this provider.
   String? get tabId;
@@ -172,4 +174,4 @@ class _FindInPageRepositoryProviderElement
   String? get tabId => (origin as FindInPageRepositoryProvider).tabId;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page_visibility.g.dart

@@ -24,4 +24,4 @@ final findInPageVisibilityControllerProvider =
 
 typedef _$FindInPageVisibilityController = AutoDisposeNotifier<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/readerview/domain/providers/readerable.dart

@@ -1,10 +1,11 @@
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'readerable.g.dart';
 
 @Riverpod(keepAlive: true)
-GeckoReaderableService readerableService(ReaderableServiceRef ref) {
+GeckoReaderableService readerableService(Ref ref) {
   final service = GeckoReaderableService.setUp();
 
   ref.onDispose(() {
@@ -15,7 +16,7 @@ GeckoReaderableService readerableService(ReaderableServiceRef ref) {
 }
 
 @Riverpod()
-Stream<bool> appearanceButtonVisibility(AppearanceButtonVisibilityRef ref) {
+Stream<bool> appearanceButtonVisibility(Ref ref) {
   final service = ref.watch(readerableServiceProvider);
   return service.appearanceVisibility;
 }

app/lib/features/geckoview/features/readerview/domain/providers/readerable.g.dart

@@ -6,7 +6,7 @@ part of 'readerable.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$readerableServiceHash() => r'aad722c3869b4ce8dbe336fada733b7d102434c5';
+String _$readerableServiceHash() => r'03182c8afc41f5184322a3206473cbfa96df5819';
 
 /// See also [readerableService].
 @ProviderFor(readerableService)
@@ -20,9 +20,11 @@ final readerableServiceProvider = Provider<GeckoReaderableService>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef ReaderableServiceRef = ProviderRef<GeckoReaderableService>;
 String _$appearanceButtonVisibilityHash() =>
-    r'996ec32ee111cfa713230a50fea3ae3a9984df7c';
+    r'e7102b63113937dd5d17028a5ec8dac428c38bbb';
 
 /// See also [appearanceButtonVisibility].
 @ProviderFor(appearanceButtonVisibility)
@@ -37,6 +39,8 @@ final appearanceButtonVisibilityProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef AppearanceButtonVisibilityRef = AutoDisposeStreamProviderRef<bool>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart

@@ -24,4 +24,4 @@ final readerableScreenControllerProvider =
 
 typedef _$ReaderableScreenController = AsyncNotifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/tabs/data/providers.dart

@@ -4,6 +4,7 @@ import 'package:lensai/data/database/functions/lexo_rank_functions.dart';
 import 'package:lensai/features/geckoview/features/tabs/data/database/database.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart' as path_provider;
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart';
@@ -12,7 +13,7 @@ import 'package:universal_io/io.dart';
 part 'providers.g.dart';
 
 @Riverpod(keepAlive: true)
-TabDatabase tabDatabase(TabDatabaseRef ref) {
+TabDatabase tabDatabase(Ref ref) {
   return TabDatabase(
     LazyDatabase(() async {
       // put the database file, called db.sqlite here, into the documents folder

app/lib/features/geckoview/features/tabs/data/providers.g.dart

@@ -6,7 +6,7 @@ part of 'providers.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabDatabaseHash() => r'567872961683d21156a9af463466f8ddbdd02f1f';
+String _$tabDatabaseHash() => r'1379e222fe4d43c119a89ec89a779ef35fbe1563';
 
 /// See also [tabDatabase].
 @ProviderFor(tabDatabase)
@@ -19,6 +19,8 @@ final tabDatabaseProvider = Provider<TabDatabase>.internal(
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef TabDatabaseRef = ProviderRef<TabDatabase>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/tabs/domain/providers.dart

@@ -5,13 +5,14 @@ import 'package:lensai/features/geckoview/features/tabs/data/models/container_da
 import 'package:lensai/features/geckoview/features/tabs/data/providers.dart';
 import 'package:lensai/features/geckoview/features/tabs/domain/repositories/container.dart';
 import 'package:lensai/features/geckoview/features/tabs/utils/color_palette.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'providers.g.dart';
 
 @Riverpod()
 Future<Color> unusedRandomContainerColor(
-  UnusedRandomContainerColorRef ref,
+  Ref ref,
 ) async {
   final repository = ref.watch(containerRepositoryProvider.notifier);
 
@@ -28,21 +29,21 @@ Future<Color> unusedRandomContainerColor(
 
 @Riverpod()
 Stream<List<ContainerDataWithCount>> containersWithCount(
-  ContainersWithCountRef ref,
+  Ref ref,
 ) {
   final db = ref.watch(tabDatabaseProvider);
   return db.containersWithCount().watch();
 }
 
 @Riverpod()
-Stream<String?> tabContainerId(TabContainerIdRef ref, String tabId) {
+Stream<String?> tabContainerId(Ref ref, String tabId) {
   final db = ref.watch(tabDatabaseProvider);
   return db.tabDao.tabContainerId(tabId).watchSingle();
 }
 
 @Riverpod()
 Stream<List<String>> containerTabIds(
-  ContainerTabIdsRef ref,
+  Ref ref,
   String? containerId,
 ) {
   final db = ref.watch(tabDatabaseProvider);

app/lib/features/geckoview/features/tabs/domain/providers.g.dart

@@ -7,7 +7,7 @@ part of 'providers.dart';
 // **************************************************************************
 
 String _$unusedRandomContainerColorHash() =>
-    r'129cefaefa895012a6d7b35da69773e28e3289cc';
+    r'913499b3de281ea0020db97ed67121652f53ec08';
 
 /// See also [unusedRandomContainerColor].
 @ProviderFor(unusedRandomContainerColor)
@@ -22,9 +22,11 @@ final unusedRandomContainerColorProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef UnusedRandomContainerColorRef = AutoDisposeFutureProviderRef<Color>;
 String _$containersWithCountHash() =>
-    r'e1bab28091dd1b9ecfd7d76e6393f459604c803a';
+    r'ee0734e4b71472b79636816616a158f54fa6bc23';
 
 /// See also [containersWithCount].
 @ProviderFor(containersWithCount)
@@ -39,9 +41,11 @@ final containersWithCountProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef ContainersWithCountRef
     = AutoDisposeStreamProviderRef<List<ContainerDataWithCount>>;
-String _$tabContainerIdHash() => r'8adbfdc2ef46219569073fe9e58967f4935a45e5';
+String _$tabContainerIdHash() => r'726ddd000d23935a2c8ae39c7957412fab16016d';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -177,6 +181,8 @@ class TabContainerIdProvider extends AutoDisposeStreamProvider<String?> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin TabContainerIdRef on AutoDisposeStreamProviderRef<String?> {
   /// The parameter `tabId` of this provider.
   String get tabId;
@@ -190,7 +196,7 @@ class _TabContainerIdProviderElement
   String get tabId => (origin as TabContainerIdProvider).tabId;
 }
 
-String _$containerTabIdsHash() => r'79e9bccfb17cf3ce802638c8b806c5a76fa8f732';
+String _$containerTabIdsHash() => r'7545a6c500b1832bf81c0838e257dfe5e051463d';
 
 /// See also [containerTabIds].
 @ProviderFor(containerTabIds)
@@ -305,6 +311,8 @@ class ContainerTabIdsProvider extends AutoDisposeStreamProvider<List<String>> {
   }
 }
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 mixin ContainerTabIdsRef on AutoDisposeStreamProviderRef<List<String>> {
   /// The parameter `containerId` of this provider.
   String? get containerId;
@@ -319,4 +327,4 @@ class _ContainerTabIdsProviderElement
   String? get containerId => (origin as ContainerTabIdsProvider).containerId;
 }
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart

@@ -1,5 +1,6 @@
 import 'package:lensai/features/geckoview/features/tabs/data/models/container_data.dart';
 import 'package:lensai/features/geckoview/features/tabs/data/providers.dart';
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'selected_container.g.dart';
@@ -29,7 +30,7 @@ class SelectedContainer extends _$SelectedContainer {
 }
 
 @Riverpod()
-Stream<ContainerData?> selectedContainerData(SelectedContainerDataRef ref) {
+Stream<ContainerData?> selectedContainerData(Ref ref) {
   final db = ref.watch(tabDatabaseProvider);
   final selectedContainer = ref.watch(selectedContainerProvider);
 

app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart

@@ -7,7 +7,7 @@ part of 'selected_container.dart';
 // **************************************************************************
 
 String _$selectedContainerDataHash() =>
-    r'dc930d1bb47b3c7989c6c119b0459f37d687af84';
+    r'1ec86a82e1fc4823a867285f05036c903633a165';
 
 /// See also [selectedContainerData].
 @ProviderFor(selectedContainerData)
@@ -22,6 +22,8 @@ final selectedContainerDataProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef SelectedContainerDataRef = AutoDisposeStreamProviderRef<ContainerData?>;
 String _$selectedContainerHash() => r'e38e86db5bd0584af9561156c26ceaea3d23aebf';
 
@@ -40,4 +42,4 @@ final selectedContainerProvider =
 
 typedef _$SelectedContainer = Notifier<String?>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart

@@ -24,4 +24,4 @@ final containerRepositoryProvider =
 
 typedef _$ContainerRepository = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart

@@ -23,4 +23,4 @@ final tabDataRepositoryProvider =
 
 typedef _$TabDataRepository = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/data/services/autosuggest.g.dart

@@ -24,4 +24,4 @@ final kagiAutosuggestServiceProvider =
 
 typedef _$KagiAutosuggestService = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/data/services/chat.g.dart

@@ -23,4 +23,4 @@ final kagiChatServiceProvider =
 
 typedef _$KagiChatService = Notifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/data/services/session.g.dart

@@ -24,4 +24,4 @@ final kagiSessionServiceProvider =
 
 typedef _$KagiSessionService = AutoDisposeNotifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/domain/repositories/autosuggest.g.dart

@@ -24,4 +24,4 @@ final autosuggestRepositoryProvider =
 
 typedef _$AutosuggestRepository = Notifier<Raw<Stream<List<String>>>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/settings/data/models/settings.dart

@@ -37,7 +37,6 @@ class Settings with FastEquatable {
     bool? incognitoMode,
     bool? enableJavascript,
     bool? launchUrlExternal,
-    bool? enableContentBlocking,
     bool? blockHttpProtocol,
     ThemeMode? themeMode,
     this.quickAction,

app/lib/features/settings/data/repositories/settings_repository.g.dart

@@ -24,4 +24,4 @@ final settingsRepositoryProvider =
 
 typedef _$SettingsRepository = AsyncNotifier<Settings>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/settings/presentation/controllers/save_settings.g.dart

@@ -24,4 +24,4 @@ final saveSettingsControllerProvider =
 
 typedef _$SaveSettingsController = AsyncNotifier<void>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/share_intent/domain/services/sharing_intent.dart

@@ -8,6 +8,7 @@ import 'package:lensai/core/logger.dart';
 import 'package:lensai/data/models/received_parameter.dart';
 import 'package:lensai/features/kagi/data/entities/modes.dart';
 import 'package:mime/mime.dart' as mime;
+import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:uri_to_file/uri_to_file.dart' as uri_to_file;
@@ -48,7 +49,7 @@ final _sharingIntentTransformer =
 );
 
 @Riverpod()
-Raw<Stream<ReceivedParameter>> sharingIntentStream(SharingIntentStreamRef ref) {
+Raw<Stream<ReceivedParameter>> sharingIntentStream(Ref ref) {
   final initialStream = FlutterSharingIntent.instance
       // ignore: discarded_futures
       .getInitialSharing()

app/lib/features/share_intent/domain/services/sharing_intent.g.dart

@@ -7,7 +7,7 @@ part of 'sharing_intent.dart';
 // **************************************************************************
 
 String _$sharingIntentStreamHash() =>
-    r'ce060aadf885ab0a14d90acfe986447ecb05f4f9';
+    r'd0634c3cbff4760eb637663716970b6ad35ccf36';
 
 /// See also [sharingIntentStream].
 @ProviderFor(sharingIntentStream)
@@ -22,7 +22,9 @@ final sharingIntentStreamProvider =
   allTransitiveDependencies: null,
 );
 
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
 typedef SharingIntentStreamRef
     = AutoDisposeProviderRef<Raw<Stream<ReceivedParameter>>>;
 // ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package