refactoring

2025-02-20 12:27:34 +01:00
parent b81fc1cc42
commit 490e13000b
138 changed files with 1392 additions and 3251 deletions
@@ -1,7 +1,7 @@
 import 'dart:async';

-import 'package:collection/collection.dart';
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:lensai/domain/entities/equatable_iterable.dart';
 import 'package:lensai/features/geckoview/domain/providers.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

@@ -10,7 +10,7 @@ part 'tab_list.g.dart';
@Riverpod(keepAlive: true)
 class TabList extends _$TabList {
  @override
-  List<String> build() {
+  EquatableCollection<List<String>> build() {
    final eventService = ref.watch(eventServiceProvider);

    ref.listen(fireImmediately: true, engineReadyStateProvider, (
@@ -23,8 +23,10 @@ class TabList extends _$TabList {
    });

    final tabListSub = eventService.tabListEvents.listen((tabs) async {
-      if (!const DeepCollectionEquality().equals(state, tabs)) {
-        state = tabs;
+      final equatableTabs = EquatableCollection(tabs, immutable: true);
+
+      if (equatableTabs != state) {
+        state = equatableTabs;
      }
    });

@@ -32,6 +34,6 @@ class TabList extends _$TabList {
      unawaited(tabListSub.cancel());
    });

-    return [];
+    return EquatableCollection([], immutable: true);
  }
 }
@@ -6,11 +6,12 @@ part of 'tab_list.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$tabListHash() => r'039099bfa102a86fd73c0544ea71f93f91e9d352';
+String _$tabListHash() => r'bb8b6cca42a8aace8bd9808fdeac4fe4965ac867';

 /// See also [TabList].
@ProviderFor(TabList)
-final tabListProvider = NotifierProvider<TabList, List<String>>.internal(
+final tabListProvider =
+    NotifierProvider<TabList, EquatableCollection<List<String>>>.internal(
  TabList.new,
  name: r'tabListProvider',
  debugGetCreateSourceHash:
@@ -19,6 +20,6 @@ final tabListProvider = NotifierProvider<TabList, List<String>>.internal(
  allTransitiveDependencies: null,
 );

-typedef _$TabList = Notifier<List<String>>;
+typedef _$TabList = Notifier<EquatableCollection<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, deprecated_member_use_from_same_package
@@ -1,6 +1,7 @@
 import 'dart:typed_data';

 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';

 part 'tab_session.g.dart';
@@ -49,3 +50,8 @@ class TabSession extends _$TabSession {
            : GeckoSessionService.forActiveTab();
  }
 }
+
+@Riverpod()
+Raw<TabSession> selectedTabSessionNotifier(Ref ref) {
+  return ref.watch(tabSessionProvider(tabId: null).notifier);
+}
@@ -6,6 +6,25 @@ part of 'tab_session.dart';
 // RiverpodGenerator
 // **************************************************************************

+String _$selectedTabSessionNotifierHash() =>
+    r'aef19991d5b05a2bb28e8a6ccb57dc75c2f3148f';
+
+/// See also [selectedTabSessionNotifier].
+@ProviderFor(selectedTabSessionNotifier)
+final selectedTabSessionNotifierProvider =
+    AutoDisposeProvider<Raw<TabSession>>.internal(
+  selectedTabSessionNotifier,
+  name: r'selectedTabSessionNotifierProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$selectedTabSessionNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef SelectedTabSessionNotifierRef = AutoDisposeProviderRef<Raw<TabSession>>;
 String _$tabSessionHash() => r'e4fbbcd430037cc01adb799783fb7974a11a27bf';

 /// Copied from Dart SDK
@@ -3,24 +3,21 @@ import 'dart:async';
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
 import 'package:lensai/extensions/image.dart';
 import 'package:lensai/extensions/nullable.dart';
-import 'package:lensai/features/geckoview/domain/entities/find_result_state.dart';
-import 'package:lensai/features/geckoview/domain/entities/history_state.dart';
-import 'package:lensai/features/geckoview/domain/entities/readerable_state.dart';
-import 'package:lensai/features/geckoview/domain/entities/security_state.dart';
-import 'package:lensai/features/geckoview/domain/entities/tab_state.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/find_result.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/history.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/readerable.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/security.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/tab.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';

 part 'tab_state.g.dart';

@Riverpod(keepAlive: true)
 class TabStates extends _$TabStates {
-  final _lock = Lock();
-
  void _onTabContentStateChange(TabContentState contentState) {
    final current =
        state[contentState.id] ?? TabState.$default(contentState.id);
@@ -137,25 +134,25 @@ class TabStates extends _$TabStates {

    final subscriptions = [
      eventService.tabContentEvents.listen((event) async {
-        await _lock.synchronized(() => _onTabContentStateChange(event));
+        _onTabContentStateChange(event);
      }),
      eventService.iconChangeEvents.listen((event) async {
-        await _lock.synchronized(() => _onIconChange(event));
+        await _onIconChange(event);
      }),
      eventService.thumbnailEvents.listen((event) async {
-        await _lock.synchronized(() => _onThumbnailChange(event));
+        await _onThumbnailChange(event);
      }),
      eventService.securityInfoEvents.listen((event) async {
-        await _lock.synchronized(() => _onSecurityInfoStateChange(event));
+        _onSecurityInfoStateChange(event);
      }),
      eventService.historyEvents.listen((event) async {
-        await _lock.synchronized(() => _onHistoryStateChange(event));
+        _onHistoryStateChange(event);
      }),
      eventService.readerableEvents.listen((event) async {
-        await _lock.synchronized(() => _onReaderableStateChange(event));
+        _onReaderableStateChange(event);
      }),
      eventService.findResultsEvent.listen((event) async {
-        await _lock.synchronized(() => _onFindResultsChange(event));
+        _onFindResultsChange(event);
      }),
    ];

@@ -173,7 +173,7 @@ final selectedTabStateProvider = AutoDisposeProvider<TabState?>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef SelectedTabStateRef = AutoDisposeProviderRef<TabState?>;
-String _$tabStatesHash() => r'296d85ec016b22236b5830fce6b01cda81fbc02d';
+String _$tabStatesHash() => r'c2169e467962d006015bf50d09e93b3f4bf596e6';

 /// See also [TabStates].
@ProviderFor(TabStates)
@@ -5,11 +5,10 @@ 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/extensions/nullable.dart';
-import 'package:lensai/features/geckoview/domain/entities/web_extension_state.dart';
+import 'package:lensai/features/geckoview/domain/entities/states/web_extension.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';

@@ -17,8 +16,6 @@ part 'web_extensions_state.g.dart';
 class WebExtensionsState extends _$WebExtensionsState {
  final _imageCache = <String, EquatableImage>{};

-  final _lock = Lock();
-
  void _onExtensionUpdate(ExtensionDataEvent event) {
    final ExtensionDataEvent(:extensionId, :data) = event;

@@ -76,18 +73,18 @@ class WebExtensionsState extends _$WebExtensionsState {
    final subscriptions = switch (actionType) {
      WebExtensionActionType.browser => [
        addonService.browserExtensionStream.listen((event) async {
-          await _lock.synchronized(() => _onExtensionUpdate(event));
+          _onExtensionUpdate(event);
        }),
        addonService.browserIconStream.listen((event) async {
-          await _lock.synchronized(() => _onIconChange(event));
+          await _onIconChange(event);
        }),
      ],
      WebExtensionActionType.page => [
        addonService.pageExtensionStream.listen((event) async {
-          await _lock.synchronized(() => _onExtensionUpdate(event));
+          _onExtensionUpdate(event);
        }),
        addonService.pageIconStream.listen((event) async {
-          await _lock.synchronized(() => _onIconChange(event));
+          await _onIconChange(event);
        }),
      ],
    };
@@ -7,7 +7,7 @@ part of 'web_extensions_state.dart';
 // **************************************************************************

 String _$webExtensionsStateHash() =>
-    r'4e6dc46e49ff353e1c3cc4616008685c0e21501d';
+    r'7fd0cb313fb433f7896bfe0f89a4545f94f58793';

 /// Copied from Dart SDK
 class _SystemHash {