feat: add post count for gel (#292)

lib/boorus/danbooru/feats/posts/app/post_count_notifier.dart → lib/boorus/core/feats/posts/count/post_count_notifier.dart

@@ -5,8 +5,9 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 // Project imports:
+import 'package:boorusama/boorus/core/feats/boorus/boorus.dart';
+import 'post_count_provider.dart';
 import 'post_count_state.dart';
-import 'posts_provider.dart';
 
 String generatePostCountKey(List<String> tags) => tags.join('+');
 
@@ -22,6 +23,7 @@ class PostCountNotifier extends Notifier<PostCountState> {
 
   @override
   PostCountState build() {
+    ref.watch(currentBooruConfigProvider);
     return PostCountState.initial();
   }
 

lib/boorus/core/feats/posts/count/post_count_provider.dart

@@ -0,0 +1,28 @@
+// Package imports:
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// Project imports:
+import 'package:boorusama/boorus/core/feats/boorus/boorus.dart';
+import 'post_count_notifier.dart';
+import 'post_count_repository.dart';
+import 'post_count_state.dart';
+
+final postCountRepoProvider = Provider<PostCountRepository>((ref) {
+  throw UnimplementedError();
+});
+
+final postCountStateProvider =
+    NotifierProvider<PostCountNotifier, PostCountState>(
+  PostCountNotifier.new,
+  dependencies: [
+    postCountRepoProvider,
+    currentBooruConfigProvider,
+  ],
+);
+
+final postCountProvider = Provider<PostCountState>(
+  (ref) => ref.watch(postCountStateProvider),
+  dependencies: [
+    postCountStateProvider,
+  ],
+);

lib/boorus/core/feats/posts/count/post_count_repository.dart

@@ -0,0 +1,10 @@
+abstract class PostCountRepository {
+  Future<int?> count(List<String> tags);
+}
+
+class EmptyPostCountRepository implements PostCountRepository {
+  const EmptyPostCountRepository();
+
+  @override
+  Future<int?> count(List<String> tags) => Future<int?>.value(null);
+}

lib/boorus/core/feats/posts/posts.dart

@@ -1,14 +1,20 @@
+export 'count/post_count_notifier.dart';
+export 'count/post_count_provider.dart';
+export 'count/post_count_repository.dart';
+export 'count/post_count_state.dart';
 export 'details.dart';
 export 'filter.dart';
 export 'media_info_mixin.dart';
 export 'post.dart';
 export 'post_details_tag.dart';
 export 'post_repository.dart';
+export 'post_repository_cacher.dart';
 export 'post_share_notifier.dart';
 export 'providers.dart';
 export 'rating.dart';
 export 'recommend.dart';
 export 'share_post_button.dart';
 export 'sources/source.dart';
+export 'sources/source_def.dart';
 export 'sources/source_utils.dart';
 export 'translatable_mixin.dart';

lib/boorus/core/pages/search/generic_search_page.dart

@@ -88,26 +88,9 @@ class _SearchPageState extends ConsumerState<GenericSearchPage> {
       child: Builder(
         builder: (context) => switch (displayState) {
           DisplayState.options => widget.optionsPageBuilder?.call() ??
-              Scaffold(
-                floatingActionButton: const SearchButton(),
-                appBar: PreferredSize(
-                  preferredSize: const Size.fromHeight(kToolbarHeight * 1.2),
-                  child: SearchAppBar(
-                    focusNode: focus,
-                    queryEditingController: queryEditingController,
-                  ),
-                ),
-                body: const SafeArea(
-                  child: SingleChildScrollView(
-                    child: Column(
-                      children: [
-                        SelectedTagListWithData(),
-                        SearchDivider(),
-                        SearchLandingView(),
-                      ],
-                    ),
-                  ),
-                ),
+              DefaultSearchOptionsView(
+                focus: focus,
+                queryEditingController: queryEditingController,
               ),
           DisplayState.suggestion => Scaffold(
               appBar: PreferredSize(
@@ -140,3 +123,43 @@ class _SearchPageState extends ConsumerState<GenericSearchPage> {
     );
   }
 }
+
+class DefaultSearchOptionsView extends StatelessWidget {
+  const DefaultSearchOptionsView({
+    super.key,
+    required this.focus,
+    required this.queryEditingController,
+    this.onSearch,
+  });
+
+  final FocusNode focus;
+  final RichTextController queryEditingController;
+  final VoidCallback? onSearch;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      floatingActionButton: SearchButton(
+        onSearch: onSearch,
+      ),
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(kToolbarHeight * 1.2),
+        child: SearchAppBar(
+          focusNode: focus,
+          queryEditingController: queryEditingController,
+        ),
+      ),
+      body: const SafeArea(
+        child: SingleChildScrollView(
+          child: Column(
+            children: [
+              SelectedTagListWithData(),
+              SearchDivider(),
+              SearchLandingView(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/boorus/core/widgets/result_header.dart

@@ -0,0 +1,70 @@
+// Flutter imports:
+import 'package:flutter/material.dart';
+
+// Package imports:
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// Project imports:
+import 'package:boorusama/boorus/core/feats/posts/posts.dart';
+import 'package:boorusama/functional.dart';
+import 'package:boorusama/widgets/widgets.dart';
+
+class ResultHeaderWithProvider extends ConsumerWidget {
+  const ResultHeaderWithProvider({
+    super.key,
+    required this.selectedTags,
+  });
+
+  final List<String> selectedTags;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final postCountState = ref.watch(postCountProvider);
+
+    if (postCountState.isLoading(selectedTags)) {
+      return const ResultHeader(count: 0, loading: true);
+    } else if (postCountState.isEmpty(selectedTags)) {
+      return const SizedBox.shrink();
+    } else {
+      return postCountState.getPostCount(selectedTags).toOption().fold(
+            () => const SizedBox.shrink(),
+            (count) => ResultHeader(
+              count: count,
+              loading: false,
+            ),
+          );
+    }
+  }
+}
+
+class ResultHeader extends StatelessWidget {
+  const ResultHeader({
+    super.key,
+    required this.count,
+    required this.loading,
+  });
+
+  final int count;
+  final bool loading;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 40,
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 16,
+              vertical: 4,
+            ),
+            child: ResultCounter(
+              count: count,
+              loading: loading,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/boorus/danbooru/danbooru_provider.dart

@@ -14,6 +14,7 @@ import 'package:boorusama/boorus/core/feats/boorus/boorus.dart';
 import 'package:boorusama/boorus/core/feats/downloads/bulk_download_provider.dart';
 import 'package:boorusama/boorus/core/feats/downloads/download_provider.dart';
 import 'package:boorusama/boorus/core/feats/notes/notes.dart';
+import 'package:boorusama/boorus/core/feats/posts/count/post_count_provider.dart';
 import 'package:boorusama/boorus/core/feats/tags/tags_providers.dart';
 import 'package:boorusama/boorus/core/provider.dart';
 import 'package:boorusama/boorus/danbooru/feats/autocomplete/autocomplete.dart';
@@ -46,6 +47,8 @@ class DanbooruProvider extends ConsumerWidget {
             .overrideWith((ref) => ref.watch(danbooruAutocompleteRepoProvider)),
         noteRepoProvider
             .overrideWith((ref) => ref.watch(danbooruNoteRepoProvider)),
+        postCountRepoProvider
+            .overrideWith((ref) => ref.watch(danbooruPostCountRepoProvider)),
       ],
       child: Builder(builder: builder),
     );

lib/boorus/danbooru/feats/posts/app/posts_count_provider.dart

@@ -1,6 +1,6 @@
 part of 'posts_provider.dart';
 
-final postCountRepoProvider = Provider<PostCountRepository>((ref) {
+final danbooruPostCountRepoProvider = Provider<PostCountRepository>((ref) {
   return PostCountRepositoryApi(
     api: ref.watch(danbooruApiProvider),
     //TODO: this is a hack to get around the fact that count endpoint includes all ratings
@@ -9,17 +9,3 @@ final postCountRepoProvider = Provider<PostCountRepository>((ref) {
         : [],
   );
 });
-
-final postCountStateProvider =
-    NotifierProvider<PostCountNotifier, PostCountState>(
-  PostCountNotifier.new,
-  dependencies: [
-    postCountRepoProvider,
-  ],
-);
-
-final postCountProvider = Provider<PostCountState>((ref) {
-  return ref.watch(postCountStateProvider);
-}, dependencies: [
-  postCountStateProvider,
-]);

lib/boorus/danbooru/feats/posts/data/post_count_repository_api.dart

@@ -1,6 +1,6 @@
 // Project imports:
 import 'package:boorusama/api/danbooru/danbooru_api.dart';
-import '../models/post_count_repository.dart';
+import 'package:boorusama/boorus/core/feats/posts/posts.dart';
 
 class PostCountRepositoryApi implements PostCountRepository {
   const PostCountRepositoryApi({

lib/boorus/danbooru/feats/posts/posts.dart

@@ -1,6 +1,4 @@
 export 'app/danbooru_favorite_group_post_mixin.dart';
-export 'app/post_count_notifier.dart';
-export 'app/post_count_state.dart';
 export 'app/post_details_artist_notifier.dart';
 export 'app/post_details_character_notifier.dart';
 export 'app/post_details_children_notifier.dart';
@@ -26,7 +24,6 @@ export 'models/danbooru_post.dart';
 export 'models/danbooru_post_repository.dart';
 export 'models/explore_repository.dart';
 export 'models/filter.dart';
-export 'models/post_count_repository.dart';
 export 'models/post_variant.dart';
 export 'models/post_vote.dart';
 export 'models/post_vote_repository.dart';

lib/boorus/danbooru/pages/search/result/result_view.dart

@@ -8,12 +8,11 @@ import 'package:scroll_to_index/scroll_to_index.dart';
 
 // Project imports:
 import 'package:boorusama/boorus/core/feats/search/selected_tags_notifier.dart';
+import 'package:boorusama/boorus/core/widgets/result_header.dart';
 import 'package:boorusama/boorus/core/widgets/widgets.dart';
 import 'package:boorusama/boorus/danbooru/feats/posts/posts.dart';
 import 'package:boorusama/boorus/danbooru/widgets/widgets.dart';
-import 'package:boorusama/functional.dart';
 import 'related_tag_section.dart';
-import 'result_header.dart';
 
 class ResultView extends ConsumerStatefulWidget {
   const ResultView({
@@ -47,7 +46,6 @@ class _ResultViewState extends ConsumerState<ResultView> {
 
   @override
   Widget build(BuildContext context) {
-    final postCountState = ref.watch(postCountProvider);
     final selectedTags = ref.watch(selectedRawTagStringProvider);
 
     return DanbooruPostScope(
@@ -65,18 +63,7 @@ class _ResultViewState extends ConsumerState<ResultView> {
             SliverToBoxAdapter(
               child: Row(
                 children: [
-                  if (postCountState.isLoading(selectedTags))
-                    const ResultHeader(count: 0, loading: true)
-                  else if (postCountState.isEmpty(selectedTags))
-                    const SizedBox.shrink()
-                  else
-                    postCountState.getPostCount(selectedTags).toOption().fold(
-                          () => const SizedBox.shrink(),
-                          (count) => ResultHeader(
-                            count: count,
-                            loading: false,
-                          ),
-                        ),
+                  ResultHeaderWithProvider(selectedTags: selectedTags),
                   const Spacer(),
                   const Padding(
                     padding: EdgeInsets.symmetric(horizontal: 8),

lib/boorus/danbooru/pages/search/search_page.dart

@@ -7,6 +7,7 @@ import 'package:page_transition/page_transition.dart';
 import 'package:rich_text_controller/rich_text_controller.dart';
 
 // Project imports:
+import 'package:boorusama/boorus/core/feats/posts/posts.dart';
 import 'package:boorusama/boorus/core/feats/search/search.dart';
 import 'package:boorusama/boorus/core/pages/search/generic_search_page.dart';
 import 'package:boorusama/boorus/core/pages/search/metatags/danbooru_metatags_section.dart';
@@ -19,7 +20,6 @@ import 'package:boorusama/boorus/core/pages/search/selected_tag_list_with_data.d
 import 'package:boorusama/boorus/core/provider.dart';
 import 'package:boorusama/boorus/core/widgets/widgets.dart';
 import 'package:boorusama/boorus/danbooru/danbooru_provider.dart';
-import 'package:boorusama/boorus/danbooru/feats/posts/posts.dart';
 import 'package:boorusama/flutter.dart';
 import 'landing/trending/trending_section.dart';
 import 'result/result_view.dart';