🐛 Fixes members' loading bugs

lib/screens/chat/room_detail.dart

@@ -14,10 +14,14 @@ import 'package:island/widgets/account/account_picker.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/paging_helper_ext.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';
 
 part 'room_detail.freezed.dart';
+part 'room_detail.g.dart';
 
 @RoutePage()
 class ChatDetailScreen extends HookConsumerWidget {
@@ -287,12 +291,51 @@ class ChatMemberNotifier extends StateNotifier<ChatRoomMemberState> {
   }
 }
 
+@riverpod
+class ChatMemberListNotifier extends _$ChatMemberListNotifier
+    with CursorPagingNotifierMixin<SnChatMember> {
+  @override
+  Future<CursorPagingData<SnChatMember>> build(String roomId) {
+    return fetch();
+  }
+
+  @override
+  Future<CursorPagingData<SnChatMember>> fetch({String? cursor}) async {
+    final offset = cursor == null ? 0 : int.parse(cursor);
+    final take = 20;
+
+    final apiClient = ref.watch(apiClientProvider);
+    final response = await apiClient.get(
+      '/chat/$roomId/members',
+      queryParameters: {'offset': offset, 'take': take},
+    );
+
+    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();
+
+    // 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,
+    );
+  }
+}
+
 class _ChatMemberListSheet extends HookConsumerWidget {
   final String roomId;
   const _ChatMemberListSheet({required this.roomId});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final memberListProvider = chatMemberListNotifierProvider(roomId);
+
+    // For backward compatibility and to show total count in the header
     final memberState = ref.watch(chatMemberStateProvider(roomId));
     final memberNotifier = ref.read(chatMemberStateProvider(roomId).notifier);
 
@@ -318,8 +361,10 @@ class _ChatMemberListSheet extends HookConsumerWidget {
           '/chat/invites/$roomId',
           data: {'related_user_id': result.id, 'role': 0},
         );
+        // Refresh both providers
         memberNotifier.reset();
         await memberNotifier.loadMore();
+        ref.invalidate(memberListProvider);
       } catch (err) {
         showErrorAlert(err);
       }
@@ -351,8 +396,10 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                 IconButton(
                   icon: const Icon(Symbols.refresh),
                   onPressed: () {
+                    // Refresh both providers
                     memberNotifier.reset();
                     memberNotifier.loadMore();
+                    ref.invalidate(memberListProvider);
                   },
                 ),
                 IconButton(
@@ -365,30 +412,19 @@ class _ChatMemberListSheet extends HookConsumerWidget {
           ),
           const Divider(height: 1),
           Expanded(
-            child:
+            child: PagingHelperView(
-                memberState.error != null
+              provider: memberListProvider,
-                    ? Center(child: Text(memberState.error!))
+              futureRefreshable: memberListProvider.future,
-                    : ListView.builder(
+              notifierRefreshable: memberListProvider.notifier,
-                      itemCount: memberState.members.length + 1,
+              contentBuilder: (data, widgetCount, endItemView) {
+                return ListView.builder(
+                  itemCount: widgetCount,
                   itemBuilder: (context, index) {
-                        if (index == memberState.members.length) {
+                    if (index == data.items.length) {
-                          if (memberState.isLoading) {
+                      return endItemView;
-                            return const Center(
-                              child: Padding(
-                                padding: EdgeInsets.all(16.0),
-                                child: CircularProgressIndicator(),
-                              ),
-                            );
-                          }
-                          if (memberState.members.length < memberState.total) {
-                            memberNotifier.loadMore(
-                              offset: memberState.members.length,
-                            );
-                          }
-                          return const SizedBox.shrink();
                     }
 
-                        final member = memberState.members[index];
+                    final member = data.items[index];
                     return ListTile(
                       contentPadding: EdgeInsets.only(left: 16, right: 12),
                       leading: ProfilePictureWidget(
@@ -432,8 +468,10 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                                       ),
                                 ).then((value) {
                                   if (value != null) {
+                                    // Refresh both providers
                                     memberNotifier.reset();
                                     memberNotifier.loadMore();
+                                    ref.invalidate(memberListProvider);
                                   }
                                 });
                               },
@@ -454,8 +492,10 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                                     await apiClient.delete(
                                       '/chat/$roomId/members/${member.accountId}',
                                     );
+                                    // Refresh both providers
                                     memberNotifier.reset();
                                     memberNotifier.loadMore();
+                                    ref.invalidate(memberListProvider);
                                   } catch (err) {
                                     showErrorAlert(err);
                                   }
@@ -466,6 +506,8 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                       ),
                     );
                   },
+                );
+              },
             ),
           ),
         ],

lib/screens/chat/room_detail.g.dart

@@ -0,0 +1,180 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'room_detail.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$chatMemberListNotifierHash() =>
+    r'f14dbb3c6ccfef26a49d8bf5dd53b05f7c63eb6c';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+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

lib/screens/realm/detail.dart

@@ -15,6 +15,7 @@ import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.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';
 
 part 'detail.g.dart';
@@ -250,6 +251,42 @@ class _RealmActionMenu extends HookConsumerWidget {
   }
 }
 
+@riverpod
+class RealmMemberListNotifier extends _$RealmMemberListNotifier
+    with CursorPagingNotifierMixin<SnRealmMember> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnRealmMember>> build(String realmSlug) async {
+    return fetch();
+  }
+
+  @override
+  Future<CursorPagingData<SnRealmMember>> fetch({String? cursor}) async {
+    final apiClient = ref.read(apiClientProvider);
+    final offset = cursor != null ? int.parse(cursor) : 0;
+
+    final response = await apiClient.get(
+      '/realms/$realmSlug/members',
+      queryParameters: {'offset': offset, 'take': _pageSize},
+    );
+
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    final List<dynamic> data = response.data;
+    final members = data.map((e) => SnRealmMember.fromJson(e)).toList();
+
+    final hasMore = offset + members.length < total;
+    final nextCursor = hasMore ? (offset + members.length).toString() : null;
+
+    return CursorPagingData(
+      items: members,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+// Keep the old provider for backward compatibility
 final realmMemberStateProvider =
     StateNotifierProvider.family<RealmMemberNotifier, RealmMemberState, String>(
       (ref, realmSlug) {
@@ -302,13 +339,15 @@ class _RealmMemberListSheet extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final realmIdentity = ref.watch(realmIdentityProvider(realmSlug));
+    final memberListProvider = realmMemberListNotifierProvider(realmSlug);
+
+    // For backward compatibility and to show total count in the header
     final memberState = ref.watch(realmMemberStateProvider(realmSlug));
     final memberNotifier = ref.read(
       realmMemberStateProvider(realmSlug).notifier,
     );
 
-    final realmIdentity = ref.watch(realmIdentityProvider(realmSlug));
-
     useEffect(() {
       Future(() {
         memberNotifier.loadMore();
@@ -329,8 +368,10 @@ class _RealmMemberListSheet extends HookConsumerWidget {
           '/realms/invites/$realmSlug',
           data: {'related_user_id': result.id, 'role': 0},
         );
+        // Refresh both providers
         memberNotifier.reset();
         await memberNotifier.loadMore();
+        ref.invalidate(memberListProvider);
       } catch (err) {
         showErrorAlert(err);
       }
@@ -362,8 +403,10 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                 IconButton(
                   icon: const Icon(Symbols.refresh),
                   onPressed: () {
+                    // Refresh both providers
                     memberNotifier.reset();
                     memberNotifier.loadMore();
+                    ref.invalidate(memberListProvider);
                   },
                 ),
                 IconButton(
@@ -376,30 +419,19 @@ class _RealmMemberListSheet extends HookConsumerWidget {
           ),
           const Divider(height: 1),
           Expanded(
-            child:
+            child: PagingHelperView(
-                memberState.error != null
+              provider: memberListProvider,
-                    ? Center(child: Text(memberState.error!))
+              futureRefreshable: memberListProvider.future,
-                    : ListView.builder(
+              notifierRefreshable: memberListProvider.notifier,
-                      itemCount: memberState.members.length + 1,
+              contentBuilder: (data, widgetCount, endItemView) {
+                return ListView.builder(
+                  itemCount: widgetCount,
                   itemBuilder: (context, index) {
-                        if (index == memberState.members.length) {
+                    if (index == data.items.length) {
-                          if (memberState.isLoading) {
+                      return endItemView;
-                            return const Center(
-                              child: Padding(
-                                padding: EdgeInsets.all(16.0),
-                                child: CircularProgressIndicator(),
-                              ),
-                            );
-                          }
-                          if (memberState.members.length < memberState.total) {
-                            memberNotifier.loadMore(
-                              offset: memberState.members.length,
-                            );
-                          }
-                          return const SizedBox.shrink();
                     }
 
-                        final member = memberState.members[index];
+                    final member = data.items[index];
                     return ListTile(
                       contentPadding: EdgeInsets.only(left: 16, right: 12),
                       leading: ProfilePictureWidget(
@@ -443,8 +475,10 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                                       ),
                                 ).then((value) {
                                   if (value != null) {
+                                    // Refresh both providers
                                     memberNotifier.reset();
                                     memberNotifier.loadMore();
+                                    ref.invalidate(memberListProvider);
                                   }
                                 });
                               },
@@ -465,8 +499,10 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                                     await apiClient.delete(
                                       '/realms/$realmSlug/members/${member.accountId}',
                                     );
+                                    // Refresh both providers
                                     memberNotifier.reset();
                                     memberNotifier.loadMore();
+                                    ref.invalidate(memberListProvider);
                                   } catch (err) {
                                     showErrorAlert(err);
                                   }
@@ -477,6 +513,8 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                       ),
                     );
                   },
+                );
+              },
             ),
           ),
         ],

lib/screens/realm/detail.g.dart

@@ -148,5 +148,155 @@ class _RealmIdentityProviderElement
   String get realmSlug => (origin as RealmIdentityProvider).realmSlug;
 }
 
+String _$realmMemberListNotifierHash() =>
+    r'b2e3eefc62a597f45df9470b2058fdda62f8853f';
+
+abstract class _$RealmMemberListNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnRealmMember>> {
+  late final String realmSlug;
+
+  FutureOr<CursorPagingData<SnRealmMember>> build(String realmSlug);
+}
+
+/// See also [RealmMemberListNotifier].
+@ProviderFor(RealmMemberListNotifier)
+const realmMemberListNotifierProvider = RealmMemberListNotifierFamily();
+
+/// See also [RealmMemberListNotifier].
+class RealmMemberListNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnRealmMember>>> {
+  /// See also [RealmMemberListNotifier].
+  const RealmMemberListNotifierFamily();
+
+  /// See also [RealmMemberListNotifier].
+  RealmMemberListNotifierProvider call(String realmSlug) {
+    return RealmMemberListNotifierProvider(realmSlug);
+  }
+
+  @override
+  RealmMemberListNotifierProvider getProviderOverride(
+    covariant RealmMemberListNotifierProvider provider,
+  ) {
+    return call(provider.realmSlug);
+  }
+
+  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'realmMemberListNotifierProvider';
+}
+
+/// See also [RealmMemberListNotifier].
+class RealmMemberListNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
+          RealmMemberListNotifier,
+          CursorPagingData<SnRealmMember>
+        > {
+  /// See also [RealmMemberListNotifier].
+  RealmMemberListNotifierProvider(String realmSlug)
+    : this._internal(
+        () => RealmMemberListNotifier()..realmSlug = realmSlug,
+        from: realmMemberListNotifierProvider,
+        name: r'realmMemberListNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$realmMemberListNotifierHash,
+        dependencies: RealmMemberListNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            RealmMemberListNotifierFamily._allTransitiveDependencies,
+        realmSlug: realmSlug,
+      );
+
+  RealmMemberListNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.realmSlug,
+  }) : super.internal();
+
+  final String realmSlug;
+
+  @override
+  FutureOr<CursorPagingData<SnRealmMember>> runNotifierBuild(
+    covariant RealmMemberListNotifier notifier,
+  ) {
+    return notifier.build(realmSlug);
+  }
+
+  @override
+  Override overrideWith(RealmMemberListNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: RealmMemberListNotifierProvider._internal(
+        () => create()..realmSlug = realmSlug,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        realmSlug: realmSlug,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    RealmMemberListNotifier,
+    CursorPagingData<SnRealmMember>
+  >
+  createElement() {
+    return _RealmMemberListNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is RealmMemberListNotifierProvider &&
+        other.realmSlug == realmSlug;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, realmSlug.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin RealmMemberListNotifierRef
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnRealmMember>> {
+  /// The parameter `realmSlug` of this provider.
+  String get realmSlug;
+}
+
+class _RealmMemberListNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          RealmMemberListNotifier,
+          CursorPagingData<SnRealmMember>
+        >
+    with RealmMemberListNotifierRef {
+  _RealmMemberListNotifierProviderElement(super.provider);
+
+  @override
+  String get realmSlug => (origin as RealmMemberListNotifierProvider).realmSlug;
+}
+
 // 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

lib/widgets/content/cloud_files.dart

@@ -298,7 +298,7 @@ class SplitAvatarWidget extends ConsumerWidget {
     return SizedBox(
       width: radius,
       height: radius,
-      child: CachedNetworkImage(imageUrl: uri, fit: BoxFit.cover),
+      child: UniversalImage(uri: uri, fit: BoxFit.cover),
     );
   }
 }

lib/widgets/post/post_list.dart

@@ -16,7 +16,6 @@ class PostListNotifier extends _$PostListNotifier
 
   @override
   Future<CursorPagingData<SnPost>> build(String? pubName) {
-    this.pubName = pubName;
     return fetch(cursor: null);
   }
 

lib/widgets/post/post_list.g.dart

@@ -6,7 +6,7 @@ part of 'post_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$postListNotifierHash() => r'58a2d5d9a8f742f0a3a3e224a51a811d43903e0d';
+String _$postListNotifierHash() => r'a2a273cbf96393a84a66bd6ae8e88058704f3195';
 
 /// Copied from Dart SDK
 class _SystemHash {