MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactoring

Browse Source
This commit is contained in:
Fabian Freund
2025-02-20 12:27:34 +01:00
parent b81fc1cc42
commit 490e13000b
138 changed files with 1392 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/geckoview/domain/controllers/bottom_sheet.dart
+1 -3
View File
@@ -1,7 +1,6 @@
import 'dart:async';
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:riverpod_annotation/riverpod_annotation.dart';
import 'package:rxdart/rxdart.dart';
@@ -11,8 +10,7 @@ part 'bottom_sheet.g.dart';
class BottomSheetController extends _$BottomSheetController {
@override
Sheet? build() {
//Don't use select here because it will only fire on new != previous
return ref.watch(createTabStreamProvider).valueOrNull;
return null;
}
// ignore: use_setters_to_change_properties api decision
app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart
+1 -1
View File
@@ -7,7 +7,7 @@ part of 'bottom_sheet.dart';
// **************************************************************************
String _$bottomSheetControllerHash() =>
r'ae91f911fc35fdc0dfb14149ac2295e58ad13a86';
r'0b0ea53a96b80b8c1cba79b1d5913274b7127d5b';
/// See also [BottomSheetController].
@ProviderFor(BottomSheetController)
app/lib/features/geckoview/domain/controllers/overlay_dialog.dart → app/lib/features/geckoview/domain/controllers/overlay.dart
+2 -2
View File
@@ -1,10 +1,10 @@
import 'package:flutter/widgets.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'overlay_dialog.g.dart';
part 'overlay.g.dart';
@Riverpod()
class OverlayDialogController extends _$OverlayDialogController {
class OverlayController extends _$OverlayController {
@override
Widget? build() {
return null;
app/lib/features/geckoview/domain/controllers/overlay_dialog.g.dart → app/lib/features/geckoview/domain/controllers/overlay.g.dart
+10 -11
View File
@@ -1,27 +1,26 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'overlay_dialog.dart';
part of 'overlay.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$overlayDialogControllerHash() =>
r'53b44d9567bcb5bd9faecbfb8bb1af5aafb369c9';
String _$overlayControllerHash() => r'b6dc3ca17611c4efadc7e8248d493cd3c7061e01';
/// See also [OverlayDialogController].
@ProviderFor(OverlayDialogController)
final overlayDialogControllerProvider =
AutoDisposeNotifierProvider<OverlayDialogController, Widget?>.internal(
OverlayDialogController.new,
name: r'overlayDialogControllerProvider',
/// See also [OverlayController].
@ProviderFor(OverlayController)
final overlayControllerProvider =
AutoDisposeNotifierProvider<OverlayController, Widget?>.internal(
OverlayController.new,
name: r'overlayControllerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$overlayDialogControllerHash,
: _$overlayControllerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$OverlayDialogController = AutoDisposeNotifier<Widget?>;
typedef _$OverlayController = 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, deprecated_member_use_from_same_package
app/lib/features/geckoview/domain/entities/find_result_state.dart → app/lib/features/geckoview/domain/entities/states/find_result.dart
View File
app/lib/features/geckoview/domain/entities/history_state.dart → app/lib/features/geckoview/domain/entities/states/history.dart
View File
app/lib/features/geckoview/domain/entities/readerable_state.dart → app/lib/features/geckoview/domain/entities/states/readerable.dart
View File
app/lib/features/geckoview/domain/entities/security_state.dart → app/lib/features/geckoview/domain/entities/states/security.dart
View File
app/lib/features/geckoview/domain/entities/tab_state.dart → app/lib/features/geckoview/domain/entities/states/tab.dart
+5 -5
View File
@@ -5,12 +5,12 @@ import 'package:lensai/data/models/web_page_info.dart';
import 'package:lensai/domain/entities/equatable_image.dart';
import 'package:lensai/extensions/nullable.dart';
import 'package:lensai/features/geckoview/domain/entities/browser_icon.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/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';
part 'tab_state.g.dart';
part 'tab.g.dart';
@CopyWith()
class TabState extends WebPageInfo with FastEquatable {
app/lib/features/geckoview/domain/entities/tab_state.g.dart → app/lib/features/geckoview/domain/entities/states/tab.g.dart
+1 -1
View File
@@ -1,6 +1,6 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'tab_state.dart';
part of 'tab.dart';
// **************************************************************************
// CopyWithGenerator
app/lib/features/geckoview/domain/entities/web_extension_state.dart → app/lib/features/geckoview/domain/entities/states/web_extension.dart
+1 -1
View File
@@ -4,7 +4,7 @@ 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';
part 'web_extension.g.dart';
@CopyWith()
class WebExtensionState with FastEquatable {
app/lib/features/geckoview/domain/entities/web_extension_state.g.dart → app/lib/features/geckoview/domain/entities/states/web_extension.g.dart
+1 -1
View File
@@ -1,6 +1,6 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'web_extension_state.dart';
part of 'web_extension.dart';
// **************************************************************************
// CopyWithGenerator
app/lib/features/geckoview/domain/providers.dart
-6
View File
@@ -3,7 +3,6 @@ import 'dart:async';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:lensai/core/logger.dart';
import 'package:lensai/features/bangs/domain/providers/bangs.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';
@@ -152,8 +151,3 @@ class EngineReadyState extends _$EngineReadyState {
return currentState;
}
}
@Riverpod()
Raw<TabSession> selectedTabSessionNotifier(Ref ref) {
return ref.watch(tabSessionProvider(tabId: null).notifier);
}
app/lib/features/geckoview/domain/providers.g.dart
-19
View File
@@ -93,25 +93,6 @@ final engineSuggestionsServiceProvider =
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef EngineSuggestionsServiceRef = ProviderRef<GeckoSuggestionsService>;
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 _$engineReadyStateHash() => r'c682333e2e07cf0635aa7ae793a2088ca648c950';
/// See also [EngineReadyState].
app/lib/features/geckoview/domain/providers/tab_list.dart
+7 -5
View File
@@ -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);
}
}
app/lib/features/geckoview/domain/providers/tab_list.g.dart
+4 -3
View File
@@ -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
app/lib/features/geckoview/domain/providers/tab_session.dart
+6
View File
@@ -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);
}
app/lib/features/geckoview/domain/providers/tab_session.g.dart
+19
View File
@@ -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
app/lib/features/geckoview/domain/providers/tab_state.dart
+12 -15
View File
@@ -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);
}),
];
app/lib/features/geckoview/domain/providers/tab_state.g.dart
+1 -1
View File
@@ -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)
app/lib/features/geckoview/domain/providers/web_extensions_state.dart
+5 -8
View File
@@ -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);
}),
],
};
app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart
+1 -1
View File
@@ -7,7 +7,7 @@ part of 'web_extensions_state.dart';
// **************************************************************************
String _$webExtensionsStateHash() =>
r'4e6dc46e49ff353e1c3cc4616008685c0e21501d';
r'7fd0cb313fb433f7896bfe0f89a4545f94f58793';
/// Copied from Dart SDK
class _SystemHash {
app/lib/features/geckoview/domain/repositories/tab.dart
+20 -6
View File
@@ -3,14 +3,16 @@ import 'dart:async';
import 'package:drift/drift.dart';
import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
import 'package:lensai/extensions/nullable.dart';
import 'package:lensai/features/geckoview/domain/entities/tab_state.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/domain/providers/tab_list.dart';
import 'package:lensai/features/geckoview/domain/providers/tab_state.dart';
import 'package:lensai/features/geckoview/features/browser/domain/providers/intent.dart';
import 'package:lensai/features/geckoview/features/tabs/data/providers.dart';
import 'package:lensai/features/geckoview/features/tabs/domain/providers/selected_container.dart';
import 'package:lensai/features/geckoview/features/tabs/domain/repositories/container.dart';
import 'package:lensai/features/share_intent/domain/entities/shared_content.dart';
import 'package:lensai/utils/debouncer.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -93,9 +95,6 @@ class TabRepository extends _$TabRepository {
final eventSerivce = ref.watch(eventServiceProvider);
final tabContentService = ref.watch(tabContentServiceProvider);
final tabStateDebouncer = Debouncer(const Duration(seconds: 3));
Map<String, TabState>? debounceStartValue;
final db = ref.watch(tabDatabaseProvider);
final tabAddedSub = eventSerivce.tabAddedStream.listen((tabId) async {
@@ -127,13 +126,18 @@ class TabRepository extends _$TabRepository {
ref.listen(tabListProvider, (previous, next) async {
//Only sync tabs if there has been a previous value or is not empty
final syncTabs = next.isNotEmpty || (previous?.isNotEmpty ?? false);
final syncTabs =
next.collection.isNotEmpty ||
(previous?.collection.isNotEmpty ?? false);
if (syncTabs) {
await db.tabDao.syncTabs(retainTabIds: next);
await db.tabDao.syncTabs(retainTabIds: next.collection);
}
});
final tabStateDebouncer = Debouncer(const Duration(seconds: 3));
Map<String, TabState>? debounceStartValue;
ref.listen(tabStatesProvider, (previous, next) async {
//Since state changes occure pretty often and our map always contains
//the latest state, we cache the value before starting debouncing and
@@ -147,6 +151,16 @@ class TabRepository extends _$TabRepository {
});
});
ref.listen(intentStreamProvider, (previous, next) {
next.whenData((value) async {
switch (value) {
case SharedUrl():
await addTab(url: value.url);
case SharedText():
}
});
});
ref.onDispose(() {
tabStateDebouncer.dispose();
unawaited(tabAddedSub.cancel());
app/lib/features/geckoview/domain/repositories/tab.g.dart
+1 -1
View File
@@ -6,7 +6,7 @@ part of 'tab.dart';
// RiverpodGenerator
// **************************************************************************
String _$tabRepositoryHash() => r'85af29fa18ea5a4a67fbffbb9478c801dafddac2';
String _$tabRepositoryHash() => r'ce0db685127eeb706ce047d7afcc58fafd1394ba';
/// See also [TabRepository].
@ProviderFor(TabRepository)