From b81fc1cc424bb542e8ce8d2f082300d476f52905 Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Wed, 19 Feb 2025 23:02:48 +0100 Subject: [PATCH] refactor core providers --- .../global_drop.dart} | 10 +------ .../global_drop.g.dart} | 18 +------------ app/lib/core/{ => providers}/models.dart | 0 app/lib/core/{ => providers}/models.g.dart | 0 app/lib/core/providers/router.dart | 11 ++++++++ app/lib/core/providers/router.g.dart | 26 +++++++++++++++++++ app/lib/core/routing/routes.dart | 2 +- .../routing/{ => widgets}/dialog_page.dart | 0 .../browser/presentation/screens/browser.dart | 2 +- .../widgets/sheets/view_tabs.dart | 2 +- .../features/tabs/data/providers.dart | 2 +- .../chat/services/qa_memory_chain.dart | 2 +- .../domain/repositories/document.dart | 2 +- .../presentation/widgets/container_chips.dart | 2 +- app/lib/presentation/widgets/main_app.dart | 2 +- 15 files changed, 47 insertions(+), 34 deletions(-) rename app/lib/core/{providers.dart => providers/global_drop.dart} (58%) rename app/lib/core/{providers.g.dart => providers/global_drop.g.dart} (64%) rename app/lib/core/{ => providers}/models.dart (100%) rename app/lib/core/{ => providers}/models.g.dart (100%) create mode 100644 app/lib/core/providers/router.dart create mode 100644 app/lib/core/providers/router.g.dart rename app/lib/core/routing/{ => widgets}/dialog_page.dart (100%) diff --git a/app/lib/core/providers.dart b/app/lib/core/providers/global_drop.dart similarity index 58% rename from app/lib/core/providers.dart rename to app/lib/core/providers/global_drop.dart index dd7ce89f..f03643a5 100644 --- a/app/lib/core/providers.dart +++ b/app/lib/core/providers/global_drop.dart @@ -1,15 +1,7 @@ -import 'package:go_router/go_router.dart'; -import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/data/models/drag_data.dart'; -import 'package:riverpod/riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -part 'providers.g.dart'; - -@Riverpod(keepAlive: true) -GoRouter router(Ref ref) { - return GoRouter(debugLogDiagnostics: true, routes: $appRoutes); -} +part 'global_drop.g.dart'; @Riverpod() class WillAcceptDrop extends _$WillAcceptDrop { diff --git a/app/lib/core/providers.g.dart b/app/lib/core/providers/global_drop.g.dart similarity index 64% rename from app/lib/core/providers.g.dart rename to app/lib/core/providers/global_drop.g.dart index 9ba8ea2a..aced262c 100644 --- a/app/lib/core/providers.g.dart +++ b/app/lib/core/providers/global_drop.g.dart @@ -1,27 +1,11 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'providers.dart'; +part of 'global_drop.dart'; // ************************************************************************** // RiverpodGenerator // ************************************************************************** -String _$routerHash() => r'25fc899b87c080600f6e1d87d510db333378bdfd'; - -/// See also [router]. -@ProviderFor(router) -final routerProvider = Provider.internal( - router, - name: r'routerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$routerHash, - dependencies: null, - allTransitiveDependencies: null, -); - -@Deprecated('Will be removed in 3.0. Use Ref instead') -// ignore: unused_element -typedef RouterRef = ProviderRef; String _$willAcceptDropHash() => r'97b47784ef9101757602b4408d1f545ef2308830'; /// See also [WillAcceptDrop]. diff --git a/app/lib/core/models.dart b/app/lib/core/providers/models.dart similarity index 100% rename from app/lib/core/models.dart rename to app/lib/core/providers/models.dart diff --git a/app/lib/core/models.g.dart b/app/lib/core/providers/models.g.dart similarity index 100% rename from app/lib/core/models.g.dart rename to app/lib/core/providers/models.g.dart diff --git a/app/lib/core/providers/router.dart b/app/lib/core/providers/router.dart new file mode 100644 index 00000000..137ffaee --- /dev/null +++ b/app/lib/core/providers/router.dart @@ -0,0 +1,11 @@ +import 'package:go_router/go_router.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:lensai/core/routing/routes.dart'; +import 'package:riverpod_annotation/riverpod_annotation.dart'; + +part 'router.g.dart'; + +@Riverpod(keepAlive: true) +GoRouter router(Ref ref) { + return GoRouter(debugLogDiagnostics: true, routes: $appRoutes); +} diff --git a/app/lib/core/providers/router.g.dart b/app/lib/core/providers/router.g.dart new file mode 100644 index 00000000..37f10e38 --- /dev/null +++ b/app/lib/core/providers/router.g.dart @@ -0,0 +1,26 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'router.dart'; + +// ************************************************************************** +// RiverpodGenerator +// ************************************************************************** + +String _$routerHash() => r'25fc899b87c080600f6e1d87d510db333378bdfd'; + +/// See also [router]. +@ProviderFor(router) +final routerProvider = Provider.internal( + router, + name: r'routerProvider', + debugGetCreateSourceHash: + const bool.fromEnvironment('dart.vm.product') ? null : _$routerHash, + dependencies: null, + allTransitiveDependencies: null, +); + +@Deprecated('Will be removed in 3.0. Use Ref instead') +// ignore: unused_element +typedef RouterRef = ProviderRef; +// 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 diff --git a/app/lib/core/routing/routes.dart b/app/lib/core/routing/routes.dart index fcafb273..3036274b 100644 --- a/app/lib/core/routing/routes.dart +++ b/app/lib/core/routing/routes.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:lensai/core/routing/dialog_page.dart'; +import 'package:lensai/core/routing/widgets/dialog_page.dart'; import 'package:lensai/data/models/web_page_info.dart'; import 'package:lensai/features/about/presentation/screens/about.dart'; import 'package:lensai/features/bangs/presentation/screens/categories.dart'; diff --git a/app/lib/core/routing/dialog_page.dart b/app/lib/core/routing/widgets/dialog_page.dart similarity index 100% rename from app/lib/core/routing/dialog_page.dart rename to app/lib/core/routing/widgets/dialog_page.dart 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 c4834b0c..a0cb4e6a 100644 --- a/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart +++ b/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart @@ -4,7 +4,7 @@ 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/providers.dart'; +import 'package:lensai/core/providers/global_drop.dart'; import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/data/models/drag_data.dart'; import 'package:lensai/features/geckoview/domain/controllers/bottom_sheet.dart'; 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 fb25649c..aaa743fe 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 @@ -6,7 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_reorderable_grid_view/widgets/widgets.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:lensai/core/providers.dart'; +import 'package:lensai/core/providers/global_drop.dart'; import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/data/models/drag_data.dart'; import 'package:lensai/features/geckoview/domain/providers/selected_tab.dart'; diff --git a/app/lib/features/geckoview/features/tabs/data/providers.dart b/app/lib/features/geckoview/features/tabs/data/providers.dart index 6487da28..217bc32c 100644 --- a/app/lib/features/geckoview/features/tabs/data/providers.dart +++ b/app/lib/features/geckoview/features/tabs/data/providers.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; -import 'package:lensai/core/models.dart'; +import 'package:lensai/core/providers/models.dart'; 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; diff --git a/app/lib/features/geckoview/features/tabs/features/chat/services/qa_memory_chain.dart b/app/lib/features/geckoview/features/tabs/features/chat/services/qa_memory_chain.dart index 6ec0a0c5..1ac43a80 100644 --- a/app/lib/features/geckoview/features/tabs/features/chat/services/qa_memory_chain.dart +++ b/app/lib/features/geckoview/features/tabs/features/chat/services/qa_memory_chain.dart @@ -1,6 +1,6 @@ import 'package:langchain/langchain.dart'; import 'package:langchain_openai/langchain_openai.dart'; -import 'package:lensai/core/models.dart'; +import 'package:lensai/core/providers/models.dart'; import 'package:lensai/features/geckoview/features/tabs/data/providers.dart'; import 'package:lensai/features/geckoview/features/tabs/features/vector_store/domain/sqlite_vector_store.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/app/lib/features/geckoview/features/tabs/features/vector_store/domain/repositories/document.dart b/app/lib/features/geckoview/features/tabs/features/vector_store/domain/repositories/document.dart index 167a63de..84ed2fd5 100644 --- a/app/lib/features/geckoview/features/tabs/features/vector_store/domain/repositories/document.dart +++ b/app/lib/features/geckoview/features/tabs/features/vector_store/domain/repositories/document.dart @@ -5,7 +5,7 @@ import 'package:exceptions/exceptions.dart'; import 'package:langchain/langchain.dart' as langchain; import 'package:langchain/langchain.dart'; import 'package:langchain_openai/langchain_openai.dart'; -import 'package:lensai/core/models.dart'; +import 'package:lensai/core/providers/models.dart'; import 'package:lensai/extensions/nullable.dart'; import 'package:lensai/features/geckoview/domain/providers.dart'; import 'package:lensai/features/geckoview/features/tabs/data/providers.dart'; diff --git a/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart b/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart index dff0fd96..0d24532c 100644 --- a/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart +++ b/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:lensai/core/providers.dart'; +import 'package:lensai/core/providers/global_drop.dart'; import 'package:lensai/core/routing/routes.dart'; import 'package:lensai/data/models/drag_data.dart'; import 'package:lensai/extensions/nullable.dart'; diff --git a/app/lib/presentation/widgets/main_app.dart b/app/lib/presentation/widgets/main_app.dart index 6c2857f0..f92f0d20 100644 --- a/app/lib/presentation/widgets/main_app.dart +++ b/app/lib/presentation/widgets/main_app.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:lensai/core/providers.dart'; +import 'package:lensai/core/providers/router.dart'; import 'package:lensai/domain/services/app_initialization.dart'; import 'package:lensai/presentation/widgets/failure_widget.dart';