🐛 Bug fixes, and fixes

2025-06-04 01:59:17 +08:00
parent 088cb4d5a2
commit 9e9d8b6fab
14 changed files with 435 additions and 106 deletions
--- a/lib/screens/creators/stickers/pack_detail.dart
+++ b/lib/screens/creators/stickers/pack_detail.dart
@ -298,7 +298,7 @@ class _StickerPackActionMenu extends HookConsumerWidget {
                  if (confirm) {
                    final client = ref.watch(apiClientProvider);
                    client.delete('/stickers/$packId');
-                    ref.invalidate(stickerPacksProvider);
+                    ref.invalidate(stickerPacksNotifierProvider);
                    if (context.mounted) context.router.maybePop(true);
                  }
                });
--- a/lib/screens/creators/stickers/stickers.dart
+++ b/lib/screens/creators/stickers/stickers.dart
@ -13,7 +13,7 @@ import 'package:island/widgets/app_scaffold.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:very_good_infinite_list/very_good_infinite_list.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';

 part 'stickers.g.dart';

@ -24,9 +24,6 @@ class StickersScreen extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final stickersState = ref.watch(stickerPacksProvider);
-    final stickersNotifier = ref.watch(stickerPacksProvider.notifier);
-
    return AppScaffold(
      appBar: AppBar(
        title: const Text('stickers').tr(),
@ -37,7 +34,7 @@ class StickersScreen extends HookConsumerWidget {
                value,
              ) {
                if (value != null) {
-                  stickersNotifier.refresh();
+                  ref.invalidate(stickerPacksNotifierProvider(pubName));
                }
              });
            },
@ -46,104 +43,90 @@ class StickersScreen extends HookConsumerWidget {
          const Gap(8),
        ],
      ),
-      body: stickersState.when(
-        data:
-            (stickers) => RefreshIndicator(
-              onRefresh: stickersNotifier.refresh,
-              child: InfiniteList(
-                padding: EdgeInsets.zero,
-                itemCount: stickers.length,
-                hasReachedMax: stickersNotifier.isReachedMax,
-                isLoading: stickersNotifier.isLoading,
-                onFetchData: stickersNotifier.fetchMore,
-                itemBuilder: (context, index) {
-                  return ListTile(
-                    title: Text(stickers[index].name),
-                    subtitle: Text(stickers[index].description),
-                    trailing: const Icon(Symbols.chevron_right),
-                    onTap: () {
-                      context.router.push(
-                        StickerPackDetailRoute(
-                          pubName: pubName,
-                          id: stickers[index].id,
-                        ),
-                      );
-                    },
-                  );
-                },
-              ),
-            ),
-        loading: () => const CircularProgressIndicator(),
-        error: (error, stack) => Text('Error: $error'),
-      ),
+      body: SliverStickerPacksList(pubName: pubName),
    );
  }
 }

-final stickerPacksProvider = StateNotifierProvider<
-  StickerPacksNotifier,
-  AsyncValue<List<SnStickerPack>>
->((ref) {
-  return StickerPacksNotifier(ref.watch(apiClientProvider));
-});
+class SliverStickerPacksList extends HookConsumerWidget {
+  final String pubName;
+  const SliverStickerPacksList({super.key, required this.pubName});

-class StickerPacksNotifier
-    extends StateNotifier<AsyncValue<List<SnStickerPack>>> {
-  final Dio _apiClient;
-  StickerPacksNotifier(this._apiClient) : super(const AsyncValue.loading()) {
-    fetchStickers();
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return PagingHelperView(
+      provider: stickerPacksNotifierProvider(pubName),
+      futureRefreshable: stickerPacksNotifierProvider(pubName).future,
+      notifierRefreshable: stickerPacksNotifierProvider(pubName).notifier,
+      contentBuilder:
+          (data, widgetCount, endItemView) => ListView.builder(
+            padding: EdgeInsets.zero,
+            itemCount: widgetCount,
+            itemBuilder: (context, index) {
+              if (index == widgetCount - 1) {
+                return endItemView;
+              }
+
+              final sticker = data.items[index];
+              return ListTile(
+                title: Text(sticker.name),
+                subtitle: Text(sticker.description),
+                trailing: const Icon(Symbols.chevron_right),
+                onTap: () {
+                  context.router.push(
+                    StickerPackDetailRoute(pubName: pubName, id: sticker.id),
+                  );
+                },
+              );
+            },
+          ),
+    );
+  }
+}
+
+@riverpod
+class StickerPacksNotifier extends _$StickerPacksNotifier
+    with CursorPagingNotifierMixin<SnStickerPack> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnStickerPack>> build(String pubName) {
+    return fetch(cursor: null);
  }

-  int offset = 0;
-  int take = 20;
-  int total = 0;
-
-  bool isLoading = false;
-  bool get isReachedMax =>
-      state.valueOrNull != null && state.valueOrNull!.length >= total;
-
-  Future<void> fetchStickers() async {
-    if (isLoading) return;
-    isLoading = true;
+  @override
+  Future<CursorPagingData<SnStickerPack>> fetch({
+    required String? cursor,
+  }) async {
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);

    try {
-      final response = await _apiClient.get(
-        '/stickers?offset=$offset&take=$take',
+      final response = await client.get(
+        '/stickers',
+        queryParameters: {
+          'offset': offset,
+          'take': _pageSize,
+          'pubName': pubName,
+        },
      );
-      if (response.statusCode == 200) {
-        total = int.parse(response.headers.value('X-Total') ?? '0');
-        final newStickers =
-            response.data
-                .map((e) => SnStickerPack.fromJson(e))
-                .cast<SnStickerPack>()
-                .toList();

-        state = AsyncValue.data(
-          state.valueOrNull != null
-              ? [...state.value!, ...newStickers]
-              : newStickers,
-        );
-        offset += take;
-      } else {
-        state = AsyncValue.error('Failed to load stickers', StackTrace.current);
-      }
-    } catch (err, stackTrace) {
-      state = AsyncValue.error(err, stackTrace);
-    } finally {
-      isLoading = false;
+      final total = int.parse(response.headers.value('X-Total') ?? '0');
+      final List<dynamic> data = response.data;
+      final stickers = data.map((e) => SnStickerPack.fromJson(e)).toList();
+
+      final hasMore = offset + stickers.length < total;
+      final nextCursor = hasMore ? (offset + stickers.length).toString() : null;
+
+      return CursorPagingData(
+        items: stickers,
+        hasMore: hasMore,
+        nextCursor: nextCursor,
+      );
+    } catch (err) {
+      rethrow;
    }
  }
-
-  Future<void> fetchMore() async {
-    if (state.valueOrNull == null || state.valueOrNull!.length >= total) return;
-    await fetchStickers();
-  }
-
-  Future<void> refresh() async {
-    offset = 0;
-    state = const AsyncValue.loading();
-    await fetchStickers();
-  }
 }

@riverpod
--- a/lib/screens/creators/stickers/stickers.g.dart
+++ b/lib/screens/creators/stickers/stickers.g.dart
@ -147,5 +147,154 @@ class _StickerPackProviderElement
  String? get packId => (origin as StickerPackProvider).packId;
 }

+String _$stickerPacksNotifierHash() =>
+    r'2feff50a7896eb8759fe91e9626b0409354d9fee';
+
+abstract class _$StickerPacksNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnStickerPack>> {
+  late final String pubName;
+
+  FutureOr<CursorPagingData<SnStickerPack>> build(String pubName);
+}
+
+/// See also [StickerPacksNotifier].
+@ProviderFor(StickerPacksNotifier)
+const stickerPacksNotifierProvider = StickerPacksNotifierFamily();
+
+/// See also [StickerPacksNotifier].
+class StickerPacksNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnStickerPack>>> {
+  /// See also [StickerPacksNotifier].
+  const StickerPacksNotifierFamily();
+
+  /// See also [StickerPacksNotifier].
+  StickerPacksNotifierProvider call(String pubName) {
+    return StickerPacksNotifierProvider(pubName);
+  }
+
+  @override
+  StickerPacksNotifierProvider getProviderOverride(
+    covariant StickerPacksNotifierProvider provider,
+  ) {
+    return call(provider.pubName);
+  }
+
+  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'stickerPacksNotifierProvider';
+}
+
+/// See also [StickerPacksNotifier].
+class StickerPacksNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
+          StickerPacksNotifier,
+          CursorPagingData<SnStickerPack>
+        > {
+  /// See also [StickerPacksNotifier].
+  StickerPacksNotifierProvider(String pubName)
+    : this._internal(
+        () => StickerPacksNotifier()..pubName = pubName,
+        from: stickerPacksNotifierProvider,
+        name: r'stickerPacksNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$stickerPacksNotifierHash,
+        dependencies: StickerPacksNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            StickerPacksNotifierFamily._allTransitiveDependencies,
+        pubName: pubName,
+      );
+
+  StickerPacksNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.pubName,
+  }) : super.internal();
+
+  final String pubName;
+
+  @override
+  FutureOr<CursorPagingData<SnStickerPack>> runNotifierBuild(
+    covariant StickerPacksNotifier notifier,
+  ) {
+    return notifier.build(pubName);
+  }
+
+  @override
+  Override overrideWith(StickerPacksNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: StickerPacksNotifierProvider._internal(
+        () => create()..pubName = pubName,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        pubName: pubName,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    StickerPacksNotifier,
+    CursorPagingData<SnStickerPack>
+  >
+  createElement() {
+    return _StickerPacksNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is StickerPacksNotifierProvider && other.pubName == pubName;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, pubName.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin StickerPacksNotifierRef
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnStickerPack>> {
+  /// The parameter `pubName` of this provider.
+  String get pubName;
+}
+
+class _StickerPacksNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          StickerPacksNotifier,
+          CursorPagingData<SnStickerPack>
+        >
+    with StickerPacksNotifierRef {
+  _StickerPacksNotifierProviderElement(super.provider);
+
+  @override
+  String get pubName => (origin as StickerPacksNotifierProvider).pubName;
+}
+
 // 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
--- a/lib/screens/posts/compose.dart
+++ b/lib/screens/posts/compose.dart
@ -142,7 +142,7 @@ class PostComposeScreen extends HookConsumerWidget {
        attachmentProgress.value = {...attachmentProgress.value, index: 0};
        final cloudFile =
            await putMediaToCloud(
-              fileData: attachment.data,
+              fileData: attachment,
              atk: token,
              baseUrl: baseUrl,
              filename: attachment.data.name ?? 'Post media',