♻️ Continued to move riverpod paging utils to own pagination utils

lib/screens/chat/room_detail.dart

@@ -9,6 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/chat.dart';
 import 'package:island/pods/chat/chat_room.dart';
 import 'package:island/pods/network.dart';
+import 'package:island/pods/paging.dart';
 import 'package:island/widgets/account/account_pfc.dart';
 import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/account/status.dart';
@@ -17,9 +18,9 @@ import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/content/sheet.dart';
 import 'package:island/screens/chat/chat_form.dart';
+import 'package:island/widgets/paging/pagination_list.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:island/pods/database.dart';
 import 'package:island/screens/chat/search_messages.dart';
@@ -600,39 +601,36 @@ class ChatMemberNotifier extends StateNotifier<ChatRoomMemberState> {
   }
 }
 
-@riverpod
-class ChatMemberListNotifier extends _$ChatMemberListNotifier
-    with CursorPagingNotifierMixin<SnChatMember> {
-  @override
-  Future<CursorPagingData<SnChatMember>> build(String roomId) {
-    return fetch();
-  }
+final chatMemberListNotifierProvider = AsyncNotifierProvider.autoDispose
+    .family<ChatMemberListNotifier, List<SnChatMember>, String>(
+      ChatMemberListNotifier.new,
+    );
+
+class ChatMemberListNotifier
+    extends AutoDisposeFamilyAsyncNotifier<List<SnChatMember>, String>
+    with FamilyAsyncPaginationController<SnChatMember, String> {
+  static const pageSize = 20;
 
   @override
-  Future<CursorPagingData<SnChatMember>> fetch({String? cursor}) async {
-    final offset = cursor == null ? 0 : int.parse(cursor);
-    final take = 20;
-
+  Future<List<SnChatMember>> fetch() async {
     final apiClient = ref.watch(apiClientProvider);
     final response = await apiClient.get(
-      '/sphere/chat/$roomId/members',
-      queryParameters: {'offset': offset, 'take': take, 'withStatus': true},
+      '/sphere/chat/$arg/members',
+      queryParameters: {
+        'offset': fetchedCount.toString(),
+        'take': pageSize,
+        'withStatus': true,
+      },
     );
 
-    final total = int.parse(response.headers.value('X-Total') ?? '0');
-    final List<dynamic> data = response.data;
-    final members = data.map((e) => SnChatMember.fromJson(e)).toList();
+    totalCount = int.parse(response.headers.value('X-Total') ?? '0');
+    final members =
+        response.data
+            .map((e) => SnChatMember.fromJson(e))
+            .cast<SnChatMember>()
+            .toList();
 
-    // Calculate next cursor based on total count
-    final nextOffset = offset + members.length;
-    final String? nextCursor =
-        nextOffset < total ? nextOffset.toString() : null;
-
-    return CursorPagingData(
-      items: members,
-      nextCursor: nextCursor,
-      hasMore: members.length < total,
-    );
+    return members;
   }
 }
 
@@ -727,75 +725,62 @@ class _ChatMemberListSheet extends HookConsumerWidget {
           ),
           const Divider(height: 1),
           Expanded(
-            child: PagingHelperView(
+            child: PaginationList(
               provider: memberListProvider,
-              futureRefreshable: memberListProvider.future,
-              notifierRefreshable: memberListProvider.notifier,
-              contentBuilder: (data, widgetCount, endItemView) {
-                return ListView.builder(
-                  itemCount: widgetCount,
-                  itemBuilder: (context, index) {
-                    if (index == data.items.length) {
-                      return endItemView;
-                    }
-
-                    final member = data.items[index];
-                    return ListTile(
-                      contentPadding: EdgeInsets.only(left: 16, right: 12),
-                      leading: AccountPfcGestureDetector(
-                        uname: member.account.name,
-                        child: ProfilePictureWidget(
-                          fileId: member.account.profile.picture?.id,
+              notifier: memberListProvider.notifier,
+              itemBuilder: (context, idx, member) {
+                return ListTile(
+                  contentPadding: EdgeInsets.only(left: 16, right: 12),
+                  leading: AccountPfcGestureDetector(
+                    uname: member.account.name,
+                    child: ProfilePictureWidget(
+                      fileId: member.account.profile.picture?.id,
+                    ),
+                  ),
+                  title: Row(
+                    spacing: 6,
+                    children: [
+                      Flexible(child: Text(member.account.nick)),
+                      if (member.status != null)
+                        AccountStatusLabel(
+                          status: member.status!,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
                         ),
-                      ),
-                      title: Row(
-                        spacing: 6,
-                        children: [
-                          Flexible(child: Text(member.account.nick)),
-                          if (member.status != null)
-                            AccountStatusLabel(
-                              status: member.status!,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          if (member.joinedAt == null)
-                            const Icon(Symbols.pending_actions, size: 20),
-                        ],
-                      ),
-                      subtitle: Text("@${member.account.name}"),
-                      trailing: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          if (isManagable)
-                            IconButton(
-                              icon: const Icon(Symbols.delete),
-                              onPressed: () {
-                                showConfirmAlert(
-                                  'removeChatMemberHint'.tr(),
-                                  'removeChatMember'.tr(),
-                                ).then((confirm) async {
-                                  if (confirm != true) return;
-                                  try {
-                                    final apiClient = ref.watch(
-                                      apiClientProvider,
-                                    );
-                                    await apiClient.delete(
-                                      '/sphere/chat/$roomId/members/${member.accountId}',
-                                    );
-                                    // Refresh both providers
-                                    memberNotifier.reset();
-                                    memberNotifier.loadMore();
-                                    ref.invalidate(memberListProvider);
-                                  } catch (err) {
-                                    showErrorAlert(err);
-                                  }
-                                });
-                              },
-                            ),
-                        ],
-                      ),
-                    );
-                  },
+                      if (member.joinedAt == null)
+                        const Icon(Symbols.pending_actions, size: 20),
+                    ],
+                  ),
+                  subtitle: Text("@${member.account.name}"),
+                  trailing: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      if (isManagable)
+                        IconButton(
+                          icon: const Icon(Symbols.delete),
+                          onPressed: () {
+                            showConfirmAlert(
+                              'removeChatMemberHint'.tr(),
+                              'removeChatMember'.tr(),
+                            ).then((confirm) async {
+                              if (confirm != true) return;
+                              try {
+                                final apiClient = ref.watch(apiClientProvider);
+                                await apiClient.delete(
+                                  '/sphere/chat/$roomId/members/${member.accountId}',
+                                );
+                                // Refresh both providers
+                                memberNotifier.reset();
+                                memberNotifier.loadMore();
+                                ref.invalidate(memberListProvider);
+                              } catch (err) {
+                                showErrorAlert(err);
+                              }
+                            });
+                          },
+                        ),
+                    ],
+                  ),
                 );
               },
             ),

lib/screens/chat/room_detail.g.dart

@@ -149,154 +149,5 @@ class _TotalMessagesCountProviderElement
   String get roomId => (origin as TotalMessagesCountProvider).roomId;
 }
 
-String _$chatMemberListNotifierHash() =>
-    r'3ea30150278523e9f6b23f9200ea9a9fbae9c973';
-
-abstract class _$ChatMemberListNotifier
-    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnChatMember>> {
-  late final String roomId;
-
-  FutureOr<CursorPagingData<SnChatMember>> build(String roomId);
-}
-
-/// See also [ChatMemberListNotifier].
-@ProviderFor(ChatMemberListNotifier)
-const chatMemberListNotifierProvider = ChatMemberListNotifierFamily();
-
-/// See also [ChatMemberListNotifier].
-class ChatMemberListNotifierFamily
-    extends Family<AsyncValue<CursorPagingData<SnChatMember>>> {
-  /// See also [ChatMemberListNotifier].
-  const ChatMemberListNotifierFamily();
-
-  /// See also [ChatMemberListNotifier].
-  ChatMemberListNotifierProvider call(String roomId) {
-    return ChatMemberListNotifierProvider(roomId);
-  }
-
-  @override
-  ChatMemberListNotifierProvider getProviderOverride(
-    covariant ChatMemberListNotifierProvider provider,
-  ) {
-    return call(provider.roomId);
-  }
-
-  static const Iterable<ProviderOrFamily>? _dependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
-
-  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
-      _allTransitiveDependencies;
-
-  @override
-  String? get name => r'chatMemberListNotifierProvider';
-}
-
-/// See also [ChatMemberListNotifier].
-class ChatMemberListNotifierProvider
-    extends
-        AutoDisposeAsyncNotifierProviderImpl<
-          ChatMemberListNotifier,
-          CursorPagingData<SnChatMember>
-        > {
-  /// See also [ChatMemberListNotifier].
-  ChatMemberListNotifierProvider(String roomId)
-    : this._internal(
-        () => ChatMemberListNotifier()..roomId = roomId,
-        from: chatMemberListNotifierProvider,
-        name: r'chatMemberListNotifierProvider',
-        debugGetCreateSourceHash:
-            const bool.fromEnvironment('dart.vm.product')
-                ? null
-                : _$chatMemberListNotifierHash,
-        dependencies: ChatMemberListNotifierFamily._dependencies,
-        allTransitiveDependencies:
-            ChatMemberListNotifierFamily._allTransitiveDependencies,
-        roomId: roomId,
-      );
-
-  ChatMemberListNotifierProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.roomId,
-  }) : super.internal();
-
-  final String roomId;
-
-  @override
-  FutureOr<CursorPagingData<SnChatMember>> runNotifierBuild(
-    covariant ChatMemberListNotifier notifier,
-  ) {
-    return notifier.build(roomId);
-  }
-
-  @override
-  Override overrideWith(ChatMemberListNotifier Function() create) {
-    return ProviderOverride(
-      origin: this,
-      override: ChatMemberListNotifierProvider._internal(
-        () => create()..roomId = roomId,
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        roomId: roomId,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeAsyncNotifierProviderElement<
-    ChatMemberListNotifier,
-    CursorPagingData<SnChatMember>
-  >
-  createElement() {
-    return _ChatMemberListNotifierProviderElement(this);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return other is ChatMemberListNotifierProvider && other.roomId == roomId;
-  }
-
-  @override
-  int get hashCode {
-    var hash = _SystemHash.combine(0, runtimeType.hashCode);
-    hash = _SystemHash.combine(hash, roomId.hashCode);
-
-    return _SystemHash.finish(hash);
-  }
-}
-
-@Deprecated('Will be removed in 3.0. Use Ref instead')
-// ignore: unused_element
-mixin ChatMemberListNotifierRef
-    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnChatMember>> {
-  /// The parameter `roomId` of this provider.
-  String get roomId;
-}
-
-class _ChatMemberListNotifierProviderElement
-    extends
-        AutoDisposeAsyncNotifierProviderElement<
-          ChatMemberListNotifier,
-          CursorPagingData<SnChatMember>
-        >
-    with ChatMemberListNotifierRef {
-  _ChatMemberListNotifierProviderElement(super.provider);
-
-  @override
-  String get roomId => (origin as ChatMemberListNotifierProvider).roomId;
-}
-
 // 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