From fe4baa58f5e0cc5e1ecda6dd4b429e290ec5a68b Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Fri, 7 Feb 2025 21:42:58 +0100 Subject: [PATCH] upgrade deps and fix some lints --- app/lib/core/providers.dart | 1 + app/lib/core/routing/routes.dart | 2 +- app/lib/features/bangs/domain/repositories/data.dart | 2 -- .../features/bangs/presentation/screens/list.dart | 5 +++-- .../bangs/presentation/widgets/bang_details.dart | 2 +- .../database/converters/chat_metadata_converter.dart | 2 +- .../chat_store/data/database/daos/messages.dart | 2 +- .../chat_store/data/database/daos/metadata.dart | 2 +- .../features/chat_store/data/database/database.dart | 3 +-- .../chat/features/chat_store/data/providers.dart | 4 ++-- .../geckoview/domain/controllers/bottom_sheet.dart | 1 + .../geckoview/domain/controllers/overlay_dialog.dart | 1 + .../presentation/dialogs/web_page_dialog.dart | 10 ++++++---- .../browser/presentation/screens/browser.dart | 5 +++-- .../presentation/widgets/sheets/create_tab.dart | 2 +- .../presentation/widgets/sheets/view_tabs.dart | 1 + .../search/presentation/widgets/bang_chips.dart | 2 +- .../presentation/screens/general_settings.dart | 7 +++---- .../user/domain/repositories/engine_settings.dart | 1 - app/pubspec.yaml | 12 ++++++------ .../src/domain/services/gecko_engine_settings.dart | 6 ++++-- .../flutter_mozilla_components/pigeons/gecko.dart | 7 ++++++- packages/flutter_mozilla_components/pubspec.yaml | 2 +- packages/sqlite3_vec/lib/sqlite3_vec.dart | 1 + 24 files changed, 47 insertions(+), 36 deletions(-) diff --git a/app/lib/core/providers.dart b/app/lib/core/providers.dart index 6b878ce7..46323c26 100644 --- a/app/lib/core/providers.dart +++ b/app/lib/core/providers.dart @@ -16,6 +16,7 @@ GoRouter router(Ref ref) { @Riverpod() class WillAcceptDrop extends _$WillAcceptDrop { + // ignore: use_setters_to_change_properties void setData(DropTargetData data) { state = data; } diff --git a/app/lib/core/routing/routes.dart b/app/lib/core/routing/routes.dart index 53f25239..9e012559 100644 --- a/app/lib/core/routing/routes.dart +++ b/app/lib/core/routing/routes.dart @@ -11,10 +11,10 @@ import 'package:lensai/features/chat_archive/presentation/screens/list.dart'; import 'package:lensai/features/chat_archive/presentation/screens/search.dart'; import 'package:lensai/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart'; import 'package:lensai/features/geckoview/features/browser/presentation/screens/browser.dart'; +import 'package:lensai/features/geckoview/features/search/presentation/screens/search.dart'; import 'package:lensai/features/geckoview/features/tabs/data/models/container_data.dart'; import 'package:lensai/features/geckoview/features/tabs/presentation/screens/container_edit.dart'; import 'package:lensai/features/geckoview/features/tabs/presentation/screens/container_list.dart'; -import 'package:lensai/features/geckoview/features/search/presentation/screens/search.dart'; import 'package:lensai/features/settings/presentation/screens/bang_settings.dart'; import 'package:lensai/features/settings/presentation/screens/general_settings.dart'; import 'package:lensai/features/settings/presentation/screens/settings.dart'; diff --git a/app/lib/features/bangs/domain/repositories/data.dart b/app/lib/features/bangs/domain/repositories/data.dart index 1270842c..66769223 100644 --- a/app/lib/features/bangs/domain/repositories/data.dart +++ b/app/lib/features/bangs/domain/repositories/data.dart @@ -1,8 +1,6 @@ import 'dart:convert'; import 'package:drift/drift.dart'; -import 'package:exceptions/exceptions.dart'; -import 'package:lensai/domain/services/generic_website.dart'; import 'package:lensai/features/bangs/data/models/bang.dart'; import 'package:lensai/features/bangs/data/models/bang_data.dart'; import 'package:lensai/features/bangs/data/models/search_history_entry.dart'; diff --git a/app/lib/features/bangs/presentation/screens/list.dart b/app/lib/features/bangs/presentation/screens/list.dart index 25474aa0..42cc8e39 100644 --- a/app/lib/features/bangs/presentation/screens/list.dart +++ b/app/lib/features/bangs/presentation/screens/list.dart @@ -5,9 +5,9 @@ import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/extensions/nullable.dart'; import 'package:lensai/features/bangs/domain/providers/bangs.dart'; import 'package:lensai/features/bangs/presentation/widgets/bang_details.dart'; +import 'package:lensai/features/geckoview/domain/controllers/bottom_sheet.dart'; import 'package:lensai/features/geckoview/features/browser/domain/entities/sheet.dart'; import 'package:lensai/features/geckoview/features/browser/domain/providers.dart'; -import 'package:lensai/features/geckoview/domain/controllers/bottom_sheet.dart'; import 'package:lensai/features/kagi/data/entities/modes.dart'; import 'package:lensai/presentation/widgets/failure_widget.dart'; @@ -23,7 +23,8 @@ class BangListScreen extends HookConsumerWidget { bangDataListProvider( filter: ( categoryFilter: category.mapNotNull( - (category) => (category: category, subCategory: subCategory)), + (category) => (category: category, subCategory: subCategory), + ), domain: null, groups: null, orderMostFrequentFirst: null, diff --git a/app/lib/features/bangs/presentation/widgets/bang_details.dart b/app/lib/features/bangs/presentation/widgets/bang_details.dart index d8b66849..575e8ecf 100644 --- a/app/lib/features/bangs/presentation/widgets/bang_details.dart +++ b/app/lib/features/bangs/presentation/widgets/bang_details.dart @@ -3,8 +3,8 @@ import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/features/bangs/data/models/bang_data.dart'; -import 'package:lensai/presentation/widgets/bang_icon.dart'; import 'package:lensai/features/geckoview/domain/repositories/tab.dart'; +import 'package:lensai/presentation/widgets/bang_icon.dart'; class BangDetails extends HookConsumerWidget { final BangData bangData; diff --git a/app/lib/features/chat/features/chat_store/data/database/converters/chat_metadata_converter.dart b/app/lib/features/chat/features/chat_store/data/database/converters/chat_metadata_converter.dart index ed5ec894..a7bbe94d 100644 --- a/app/lib/features/chat/features/chat_store/data/database/converters/chat_metadata_converter.dart +++ b/app/lib/features/chat/features/chat_store/data/database/converters/chat_metadata_converter.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:lensai/features/chat/features/chat_store/data/models/chat_metadata.dart'; import 'package:drift/drift.dart'; +import 'package:lensai/features/chat/features/chat_store/data/models/chat_metadata.dart'; class ChatMetadataConverter extends TypeConverter { const ChatMetadataConverter(); diff --git a/app/lib/features/chat/features/chat_store/data/database/daos/messages.dart b/app/lib/features/chat/features/chat_store/data/database/daos/messages.dart index 90ebf954..ac92750b 100644 --- a/app/lib/features/chat/features/chat_store/data/database/daos/messages.dart +++ b/app/lib/features/chat/features/chat_store/data/database/daos/messages.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:lensai/features/chat/features/chat_store/data/database/database.dart'; import 'package:drift/drift.dart'; import 'package:flutter_chat_core/flutter_chat_core.dart'; +import 'package:lensai/features/chat/features/chat_store/data/database/database.dart'; import 'package:lexo_rank/lexo_rank.dart'; part 'messages.g.dart'; diff --git a/app/lib/features/chat/features/chat_store/data/database/daos/metadata.dart b/app/lib/features/chat/features/chat_store/data/database/daos/metadata.dart index 4a98d51a..4d3b8f07 100644 --- a/app/lib/features/chat/features/chat_store/data/database/daos/metadata.dart +++ b/app/lib/features/chat/features/chat_store/data/database/daos/metadata.dart @@ -1,6 +1,6 @@ +import 'package:drift/drift.dart'; import 'package:lensai/features/chat/features/chat_store/data/database/database.dart'; import 'package:lensai/features/chat/features/chat_store/data/models/chat_metadata.dart'; -import 'package:drift/drift.dart'; part 'metadata.g.dart'; diff --git a/app/lib/features/chat/features/chat_store/data/database/database.dart b/app/lib/features/chat/features/chat_store/data/database/database.dart index 90ecc1df..60c84113 100644 --- a/app/lib/features/chat/features/chat_store/data/database/database.dart +++ b/app/lib/features/chat/features/chat_store/data/database/database.dart @@ -1,10 +1,9 @@ +import 'package:drift/drift.dart'; import 'package:lensai/features/chat/features/chat_store/data/database/converters/chat_metadata_converter.dart'; import 'package:lensai/features/chat/features/chat_store/data/database/daos/messages.dart'; import 'package:lensai/features/chat/features/chat_store/data/database/daos/metadata.dart'; import 'package:lensai/features/chat/features/chat_store/data/models/chat_metadata.dart'; -import 'package:drift/drift.dart'; - part 'database.g.dart'; @DriftDatabase(include: {'database.drift'}, daos: [MessagesDao, MetadataDao]) diff --git a/app/lib/features/chat/features/chat_store/data/providers.dart b/app/lib/features/chat/features/chat_store/data/providers.dart index 9e3d1786..afe2a95b 100644 --- a/app/lib/features/chat/features/chat_store/data/providers.dart +++ b/app/lib/features/chat/features/chat_store/data/providers.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:lensai/data/database/functions/lexo_rank_functions.dart'; -import 'package:lensai/features/chat/features/chat_store/data/database/database.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; +import 'package:lensai/data/database/functions/lexo_rank_functions.dart'; +import 'package:lensai/features/chat/features/chat_store/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'; diff --git a/app/lib/features/geckoview/domain/controllers/bottom_sheet.dart b/app/lib/features/geckoview/domain/controllers/bottom_sheet.dart index 289e9401..cf496a6b 100644 --- a/app/lib/features/geckoview/domain/controllers/bottom_sheet.dart +++ b/app/lib/features/geckoview/domain/controllers/bottom_sheet.dart @@ -15,6 +15,7 @@ class BottomSheetController extends _$BottomSheetController { return ref.watch(createTabStreamProvider).valueOrNull; } + // ignore: use_setters_to_change_properties void show(Sheet sheet) { state = sheet; } diff --git a/app/lib/features/geckoview/domain/controllers/overlay_dialog.dart b/app/lib/features/geckoview/domain/controllers/overlay_dialog.dart index 233f0bc2..8ed11080 100644 --- a/app/lib/features/geckoview/domain/controllers/overlay_dialog.dart +++ b/app/lib/features/geckoview/domain/controllers/overlay_dialog.dart @@ -10,6 +10,7 @@ class OverlayDialogController extends _$OverlayDialogController { return null; } + // ignore: use_setters_to_change_properties void show(Widget dialog) { state = dialog; } diff --git a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart index ba55516c..e2af4cfe 100644 --- a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart +++ b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart @@ -254,8 +254,8 @@ class WebPageDialog extends HookConsumerWidget { final updateResult = await ref .read( chatMetadataRepositoryProvider( - selectedTabId) - .notifier, + selectedTabId, + ).notifier, ) .updateMetadata( ChatMetadata(mainDocumentId: selectedTabId), @@ -264,9 +264,11 @@ class WebPageDialog extends HookConsumerWidget { updateResult.onSuccess((_) { ref .read( - bottomSheetControllerProvider.notifier) + bottomSheetControllerProvider.notifier, + ) .show( - TabQaChatSheet(chatId: selectedTabId)); + TabQaChatSheet(chatId: selectedTabId), + ); }); } diff --git a/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart b/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart index 5a0fd3dd..bdf95355 100644 --- a/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart +++ b/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart @@ -827,8 +827,9 @@ class BrowserScreen extends HookConsumerWidget { draggableScrollableController, onClose: () { ref - .read(bottomSheetControllerProvider - .notifier) + .read( + bottomSheetControllerProvider.notifier, + ) .dismiss(); }, ), diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/create_tab.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/create_tab.dart index aa9a7462..7c27f53b 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/create_tab.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/create_tab.dart @@ -34,7 +34,7 @@ class CreateTabSheetWidget extends HookConsumerWidget { () => parameter.preferredTool?.index ?? switch (sharedContent) { - SharedText(text: final text) => KagiTool.search.index + SharedText(text: final _) => KagiTool.search.index // (showEarlyAccessFeatures && text.length > 25) // ? KagiTool.assistant.index // : KagiTool.search.index, diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/view_tabs.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/view_tabs.dart index a1acdb64..3a63a0d2 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/view_tabs.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/sheets/view_tabs.dart @@ -251,6 +251,7 @@ class ViewTabsSheetWidget extends HookConsumerWidget { final filteredTabIds = ref.watch( seamlessFilteredTabIdsProvider( TabSearchPartition.preview, + // ignore: provider_parameters ContainerFilterById(containerId: container), ), ); diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart b/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart index b9706ca4..9dce37ec 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart @@ -4,8 +4,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/features/bangs/data/models/bang_data.dart'; import 'package:lensai/features/bangs/domain/repositories/search.dart'; -import 'package:lensai/presentation/widgets/bang_icon.dart'; import 'package:lensai/presentation/hooks/listenable_callback.dart'; +import 'package:lensai/presentation/widgets/bang_icon.dart'; import 'package:lensai/presentation/widgets/selectable_chips.dart'; class BangChips extends HookConsumerWidget { diff --git a/app/lib/features/settings/presentation/screens/general_settings.dart b/app/lib/features/settings/presentation/screens/general_settings.dart index bd1f8c9f..e306f382 100644 --- a/app/lib/features/settings/presentation/screens/general_settings.dart +++ b/app/lib/features/settings/presentation/screens/general_settings.dart @@ -15,8 +15,6 @@ class GeneralSettingsScreen extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final theme = Theme.of(context); - final generalSettings = ref.watch(generalSettingsRepositoryProvider); return Scaffold( @@ -61,8 +59,9 @@ class GeneralSettingsScreen extends HookConsumerWidget { selected: {generalSettings.themeMode}, onSelectionChanged: (value) async { await ref - .read(saveGeneralSettingsControllerProvider - .notifier) + .read( + saveGeneralSettingsControllerProvider.notifier, + ) .save( (currentSettings) => currentSettings.copyWith .themeMode(value.first), diff --git a/app/lib/features/user/domain/repositories/engine_settings.dart b/app/lib/features/user/domain/repositories/engine_settings.dart index f016de18..fc586903 100644 --- a/app/lib/features/user/domain/repositories/engine_settings.dart +++ b/app/lib/features/user/domain/repositories/engine_settings.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:drift/drift.dart'; -import 'package:lensai/features/user/data/database/database.dart'; import 'package:lensai/features/user/data/models/engine_settings.dart'; import 'package:lensai/features/user/data/providers.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/app/pubspec.yaml b/app/pubspec.yaml index f0e9751d..e3b4efe7 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: collection: ^1.19.0 copy_with_extension: ^6.0.1 - cross_cache: ^0.0.4 + cross_cache: ^0.0.5 crypto: ^3.0.6 drift: ^2.24.0 dynamic_color: ^1.7.0 @@ -17,7 +17,7 @@ dependencies: expandable_page_view: ^1.0.17 fading_scroll: ^0.9.1 fast_equatable: ^1.1.0 - file_picker: ^8.3.1 + file_picker: ^8.3.2 flutter: sdk: flutter flutter_chat_core: @@ -25,7 +25,7 @@ dependencies: flutter_chat_ui: path: ../../flutter_chat_ui/packages/flutter_chat_ui flutter_hooks: ^0.20.5 - flutter_markdown: ^0.7.6 + flutter_markdown: ^0.7.6+1 flutter_material_design_icons: ^1.1.7447 flutter_mozilla_components: path: ../packages/flutter_mozilla_components @@ -35,9 +35,9 @@ dependencies: flutter_secure_storage: ^10.0.0-beta.4 flutter_sharing_intent: ^1.1.1 flutter_slidable: ^4.0.0 - go_router: ^14.7.2 + go_router: ^14.8.0 google_fonts: ^6.2.1 - home_widget: ^0.7.0 + home_widget: ^0.7.0+1 hooks_riverpod: ^2.6.1 html: ^0.15.5 http: ^1.3.0 @@ -53,7 +53,7 @@ dependencies: logger: ^2.5.0 markdown: ^7.3.0 mime: ^2.0.0 - package_info_plus: ^8.1.4 + package_info_plus: ^8.2.1 path: ^1.9.0 path_provider: ^2.1.5 pocketbase: ^0.21.0 diff --git a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_engine_settings.dart b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_engine_settings.dart index afaa3429..05dc4fc2 100644 --- a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_engine_settings.dart +++ b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_engine_settings.dart @@ -8,8 +8,10 @@ class GeckoEngineSettingsService { GeckoEngineSettingsService({GeckoEngineSettingsApi? api}) : _api = api ?? _apiInstance; - Future setDefaultSettings(GeckoEngineSettings settings, - {bool updateRuntime = true}) { + Future setDefaultSettings( + GeckoEngineSettings settings, { + bool updateRuntime = true, + }) { return updateRuntime ? _api.updateRuntimeSettings(settings) : _api.setDefaultSettings(settings); diff --git a/packages/flutter_mozilla_components/pigeons/gecko.dart b/packages/flutter_mozilla_components/pigeons/gecko.dart index 663f976a..4330f3c6 100644 --- a/packages/flutter_mozilla_components/pigeons/gecko.dart +++ b/packages/flutter_mozilla_components/pigeons/gecko.dart @@ -604,7 +604,12 @@ class AutocompleteResult { final int totalItems; AutocompleteResult( - this.input, this.text, this.url, this.source, this.totalItems); + this.input, + this.text, + this.url, + this.source, + this.totalItems, + ); } // /// Represents all the different supported types of data that can be found from long clicking diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml index 41070385..ac2dcd53 100644 --- a/packages/flutter_mozilla_components/pubspec.yaml +++ b/packages/flutter_mozilla_components/pubspec.yaml @@ -17,7 +17,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.3.0 - pigeon: ^22.7.4 + pigeon: ^24.1.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/sqlite3_vec/lib/sqlite3_vec.dart b/packages/sqlite3_vec/lib/sqlite3_vec.dart index 3b0cba84..9ca89e6c 100644 --- a/packages/sqlite3_vec/lib/sqlite3_vec.dart +++ b/packages/sqlite3_vec/lib/sqlite3_vec.dart @@ -5,6 +5,7 @@ import 'package:sqlite3/sqlite3.dart'; const String _libName = 'vec0'; +// ignore: avoid_classes_with_only_static_members class Sqlite3Vec { static void ensureExtensionLoaded() { final libPath = switch (Platform.operatingSystem) {