🎉 Launch 3.2.0+128

💄 Optimize articles view
🐛 Fix bugs
2025-08-25 01:55:54 +08:00 · 2025-08-25 01:48:43 +08:00 · 2025-08-24 23:50:36 +08:00 · 2025-08-24 23:46:14 +08:00 · 2025-08-24 22:33:41 +08:00 · 2025-08-24 21:49:40 +08:00
22 changed files with 1694 additions and 1533 deletions
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -907,5 +907,24 @@
  "copyKeyHint": "Please copy this key and store it somewhere safe. You will not be able to see it again.",
  "rotateKey": "Rotate Key",
  "rotateBotKey": "Rotate Bot Key",
-  "rotateBotKeyHint": "Are you sure you want to rotate this key? The old key will become invalid immediately. This action cannot be undone."
+  "rotateBotKeyHint": "Are you sure you want to rotate this key? The old key will become invalid immediately. This action cannot be undone.",
+  "webFeedArticleCount": {
+    "zero": "No articles",
+    "one": "{} article",
+    "other": "{} articles"
+  },
+  "webFeedSubscribed": "The feed has been subscribed",
+  "webFeedUnsubscribed": "The feed has been unsubscribed",
+  "appDetails": "App Details",
+  "secrets": "Secrets",
+  "appNotFound": "App not found.",
+  "secretCopied": "Secret copied to clipboard.",
+  "deleteSecret": "Delete Secret",
+  "deleteSecretHint": "Are you sure you want to delete this secret? This action cannot be undone.",
+  "generateSecret": "Generate New Secret",
+  "createdAt": "Created at {}",
+  "newSecretGenerated": "New Secret Generated",
+  "copySecretHint": "Please copy this secret and store it somewhere safe. You will not be able to see it again.",
+  "expiresIn": "Expires In (seconds)",
+  "isOidc": "OIDC Compliant"
 }
--- a/assets/i18n/zh-CN.json
+++ b/assets/i18n/zh-CN.json
@@ -843,5 +843,17 @@
  "socialCreditsLevelPoor": "糟糕",
  "socialCreditsLevelNormal": "正常",
  "socialCreditsLevelGood": "良好",
-  "socialCreditsLevelExcellent": "优秀"
+  "socialCreditsLevelExcellent": "优秀",
+  "appDetails": "应用详情",
+  "secrets": "密钥",
+  "appNotFound": "应用未找到。",
+  "secretCopied": "密钥已复制到剪贴板。",
+  "deleteSecret": "删除密钥",
+  "deleteSecretHint": "您确定要删除此密钥吗？此操作无法撤销。",
+  "generateSecret": "生成新密钥",
+  "createdAt": "创建于 {}",
+  "newSecretGenerated": "已生成新密钥",
+  "copySecretHint": "请复制此密钥并将其存放在安全的地方。您将无法再次看到它。",
+  "expiresIn": "过期时间（秒）",
+  "isOidc": "OIDC 兼容"
 }
--- a/assets/i18n/zh-TW.json
+++ b/assets/i18n/zh-TW.json
@@ -811,5 +811,17 @@
    "filesListAdditional": {
        "one": "+{} 個文件被摺疊",
        "other": "+{} 個文件被摺疊"
-    }
+    },
+    "appDetails": "應用程式詳情",
+    "secrets": "密鑰",
+    "appNotFound": "找不到應用程式。",
+    "secretCopied": "密鑰已複製到剪貼簿。",
+    "deleteSecret": "刪除密鑰",
+    "deleteSecretHint": "您確定要刪除此密鑰嗎？此操作無法復原。",
+    "generateSecret": "產生新密鑰",
+    "createdAt": "建立於 {}",
+    "newSecretGenerated": "已產生新密鑰",
+    "copySecretHint": "請複製此密鑰並將其存放在安全的地方。您將無法再次看到它。",
+    "expiresIn": "過期時間（秒）",
+    "isOidc": "OIDC 相容"
 }
--- a/lib/models/custom_app_secret.dart
+++ b/lib/models/custom_app_secret.dart
@@ -0,0 +1,19 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'custom_app_secret.freezed.dart';
+part 'custom_app_secret.g.dart';
+
+@freezed
+sealed class CustomAppSecret with _$CustomAppSecret {
+  const factory CustomAppSecret({
+    required String id,
+    required String? secret,
+    required DateTime createdAt,
+    String? description,
+    int? expiresIn,
+    bool? isOidc,
+  }) = _CustomAppSecret;
+
+  factory CustomAppSecret.fromJson(Map<String, dynamic> json) =>
+      _$CustomAppSecretFromJson(json);
+}
--- a/lib/models/custom_app_secret.freezed.dart
+++ b/lib/models/custom_app_secret.freezed.dart
@@ -0,0 +1,286 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'custom_app_secret.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$CustomAppSecret {
+
+ String get id; String? get secret; DateTime get createdAt; String? get description; int? get expiresIn; bool? get isOidc;
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CustomAppSecretCopyWith<CustomAppSecret> get copyWith => _$CustomAppSecretCopyWithImpl<CustomAppSecret>(this as CustomAppSecret, _$identity);
+
+  /// Serializes this CustomAppSecret to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CustomAppSecret&&(identical(other.id, id) || other.id == id)&&(identical(other.secret, secret) || other.secret == secret)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.description, description) || other.description == description)&&(identical(other.expiresIn, expiresIn) || other.expiresIn == expiresIn)&&(identical(other.isOidc, isOidc) || other.isOidc == isOidc));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,secret,createdAt,description,expiresIn,isOidc);
+
+@override
+String toString() {
+  return 'CustomAppSecret(id: $id, secret: $secret, createdAt: $createdAt, description: $description, expiresIn: $expiresIn, isOidc: $isOidc)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CustomAppSecretCopyWith<$Res>  {
+  factory $CustomAppSecretCopyWith(CustomAppSecret value, $Res Function(CustomAppSecret) _then) = _$CustomAppSecretCopyWithImpl;
+@useResult
+$Res call({
+ String id, String? secret, DateTime createdAt, String? description, int? expiresIn, bool? isOidc
+});
+
+
+
+
+}
+/// @nodoc
+class _$CustomAppSecretCopyWithImpl<$Res>
+    implements $CustomAppSecretCopyWith<$Res> {
+  _$CustomAppSecretCopyWithImpl(this._self, this._then);
+
+  final CustomAppSecret _self;
+  final $Res Function(CustomAppSecret) _then;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? secret = freezed,Object? createdAt = null,Object? description = freezed,Object? expiresIn = freezed,Object? isOidc = freezed,}) {
+  return _then(_self.copyWith(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,secret: freezed == secret ? _self.secret : secret // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,expiresIn: freezed == expiresIn ? _self.expiresIn : expiresIn // ignore: cast_nullable_to_non_nullable
+as int?,isOidc: freezed == isOidc ? _self.isOidc : isOidc // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CustomAppSecret].
+extension CustomAppSecretPatterns on CustomAppSecret {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CustomAppSecret value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CustomAppSecret value)  $default,){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret():
+return $default(_that);}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CustomAppSecret value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)  $default,) {final _that = this;
+switch (_that) {
+case _CustomAppSecret():
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String id,  String? secret,  DateTime createdAt,  String? description,  int? expiresIn,  bool? isOidc)?  $default,) {final _that = this;
+switch (_that) {
+case _CustomAppSecret() when $default != null:
+return $default(_that.id,_that.secret,_that.createdAt,_that.description,_that.expiresIn,_that.isOidc);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _CustomAppSecret implements CustomAppSecret {
+  const _CustomAppSecret({required this.id, required this.secret, required this.createdAt, this.description, this.expiresIn, this.isOidc});
+  factory _CustomAppSecret.fromJson(Map<String, dynamic> json) => _$CustomAppSecretFromJson(json);
+
+@override final  String id;
+@override final  String? secret;
+@override final  DateTime createdAt;
+@override final  String? description;
+@override final  int? expiresIn;
+@override final  bool? isOidc;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CustomAppSecretCopyWith<_CustomAppSecret> get copyWith => __$CustomAppSecretCopyWithImpl<_CustomAppSecret>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$CustomAppSecretToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CustomAppSecret&&(identical(other.id, id) || other.id == id)&&(identical(other.secret, secret) || other.secret == secret)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.description, description) || other.description == description)&&(identical(other.expiresIn, expiresIn) || other.expiresIn == expiresIn)&&(identical(other.isOidc, isOidc) || other.isOidc == isOidc));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,id,secret,createdAt,description,expiresIn,isOidc);
+
+@override
+String toString() {
+  return 'CustomAppSecret(id: $id, secret: $secret, createdAt: $createdAt, description: $description, expiresIn: $expiresIn, isOidc: $isOidc)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CustomAppSecretCopyWith<$Res> implements $CustomAppSecretCopyWith<$Res> {
+  factory _$CustomAppSecretCopyWith(_CustomAppSecret value, $Res Function(_CustomAppSecret) _then) = __$CustomAppSecretCopyWithImpl;
+@override @useResult
+$Res call({
+ String id, String? secret, DateTime createdAt, String? description, int? expiresIn, bool? isOidc
+});
+
+
+
+
+}
+/// @nodoc
+class __$CustomAppSecretCopyWithImpl<$Res>
+    implements _$CustomAppSecretCopyWith<$Res> {
+  __$CustomAppSecretCopyWithImpl(this._self, this._then);
+
+  final _CustomAppSecret _self;
+  final $Res Function(_CustomAppSecret) _then;
+
+/// Create a copy of CustomAppSecret
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? secret = freezed,Object? createdAt = null,Object? description = freezed,Object? expiresIn = freezed,Object? isOidc = freezed,}) {
+  return _then(_CustomAppSecret(
+id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable
+as String,secret: freezed == secret ? _self.secret : secret // ignore: cast_nullable_to_non_nullable
+as String?,createdAt: null == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable
+as DateTime,description: freezed == description ? _self.description : description // ignore: cast_nullable_to_non_nullable
+as String?,expiresIn: freezed == expiresIn ? _self.expiresIn : expiresIn // ignore: cast_nullable_to_non_nullable
+as int?,isOidc: freezed == isOidc ? _self.isOidc : isOidc // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/lib/models/custom_app_secret.g.dart
+++ b/lib/models/custom_app_secret.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_app_secret.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_CustomAppSecret _$CustomAppSecretFromJson(Map<String, dynamic> json) =>
+    _CustomAppSecret(
+      id: json['id'] as String,
+      secret: json['secret'] as String?,
+      createdAt: DateTime.parse(json['created_at'] as String),
+      description: json['description'] as String?,
+      expiresIn: (json['expires_in'] as num?)?.toInt(),
+      isOidc: json['is_oidc'] as bool?,
+    );
+
+Map<String, dynamic> _$CustomAppSecretToJson(_CustomAppSecret instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'secret': instance.secret,
+      'created_at': instance.createdAt.toIso8601String(),
+      'description': instance.description,
+      'expires_in': instance.expiresIn,
+      'is_oidc': instance.isOidc,
+    };
--- a/lib/route.dart
+++ b/lib/route.dart
@@ -7,6 +7,7 @@ import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/screens/about.dart';
 import 'package:island/screens/account/credits.dart';
+import 'package:island/screens/developers/app_detail.dart';
 import 'package:island/screens/developers/bot_detail.dart';
 import 'package:island/screens/developers/edit_app.dart';
 import 'package:island/screens/developers/edit_bot.dart';
@@ -349,6 +350,16 @@ final routerProvider = Provider<GoRouter>((ref) {
                          id: state.pathParameters['id']!,
                        ),
                  ),
+                  GoRoute(
+                    name: 'developerAppDetail',
+                    path: 'apps/:appId',
+                    builder:
+                        (context, state) => AppDetailScreen(
+                          publisherName: state.pathParameters['name']!,
+                          projectId: state.pathParameters['projectId']!,
+                          appId: state.pathParameters['appId']!,
+                        ),
+                  ),
                  GoRoute(
                    name: 'developerBotDetail',
                    path: 'bots/:botId',
--- a/lib/screens/developers/app_detail.dart
+++ b/lib/screens/developers/app_detail.dart
@@ -0,0 +1,131 @@
+import 'package:easy_localization/easy_localization.dart';
+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:island/models/custom_app.dart';
+import 'package:island/screens/developers/app_secrets.dart';
+import 'package:island/screens/developers/apps.dart';
+import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/response.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+class AppDetailScreen extends HookConsumerWidget {
+  final String publisherName;
+  final String projectId;
+  final String appId;
+
+  const AppDetailScreen({
+    super.key,
+    required this.publisherName,
+    required this.projectId,
+    required this.appId,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final tabController = useTabController(initialLength: 2);
+    final appData = ref.watch(customAppProvider(publisherName, projectId, appId));
+
+    return AppScaffold(
+      appBar: AppBar(
+        title: Text(appData.value?.name ?? 'appDetails'.tr()),
+        actions: [
+          IconButton(
+            icon: const Icon(Symbols.edit),
+            onPressed: appData.value == null
+                ? null
+                : () {
+                    context.pushNamed(
+                      'developerAppEdit',
+                      pathParameters: {
+                        'name': publisherName,
+                        'projectId': projectId,
+                        'id': appId,
+                      },
+                    );
+                  },
+          ),
+        ],
+        bottom: TabBar(
+          controller: tabController,
+          tabs: [Tab(text: 'overview'.tr()), Tab(text: 'secrets'.tr())],
+        ),
+      ),
+      body: appData.when(
+        data: (app) {
+          return TabBarView(
+            controller: tabController,
+            physics: const NeverScrollableScrollPhysics(),
+            children: [
+              _AppOverview(app: app),
+              AppSecretsScreen(
+                publisherName: publisherName,
+                projectId: projectId,
+                appId: appId,
+              ),
+            ],
+          );
+        },
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (err, stack) => ResponseErrorWidget(
+          error: err,
+          onRetry: () => ref.invalidate(
+            customAppProvider(publisherName, projectId, appId),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _AppOverview extends StatelessWidget {
+  final CustomApp app;
+  const _AppOverview({required this.app});
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        children: [
+          AspectRatio(
+            aspectRatio: 16 / 7,
+            child: Stack(
+              clipBehavior: Clip.none,
+              fit: StackFit.expand,
+              children: [
+                Container(
+                  color: Theme.of(context).colorScheme.surfaceContainer,
+                  child: app.background != null
+                      ? CloudFileWidget(
+                          item: app.background!,
+                          fit: BoxFit.cover,
+                        )
+                      : const SizedBox.shrink(),
+                ),
+                Positioned(
+                  left: 20,
+                  bottom: -32,
+                  child: ProfilePictureWidget(
+                    fileId: app.picture?.id,
+                    radius: 40,
+                    fallbackIcon: Symbols.apps,
+                  ),
+                ),
+              ],
+            ),
+          ).padding(bottom: 32),
+          ListTile(title: Text('name'.tr()), subtitle: Text(app.name)),
+          ListTile(title: Text('slug'.tr()), subtitle: Text(app.slug)),
+          if (app.description?.isNotEmpty ?? false)
+            ListTile(
+              title: Text('description'.tr()),
+              subtitle: Text(app.description!),
+            ),
+        ],
+      ).padding(bottom: 24),
+    );
+  }
+}
--- a/lib/screens/developers/app_secrets.dart
+++ b/lib/screens/developers/app_secrets.dart
@@ -0,0 +1,252 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/custom_app_secret.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/services/time.dart';
+import 'package:island/widgets/alert.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/response.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'app_secrets.g.dart';
+
+@riverpod
+Future<List<CustomAppSecret>> customAppSecrets(
+  Ref ref,
+  String publisherName,
+  String projectId,
+  String appId,
+) async {
+  final client = ref.watch(apiClientProvider);
+  final resp = await client.get(
+    '/develop/developers/$publisherName/projects/$projectId/apps/$appId/secrets',
+  );
+  return (resp.data as List)
+      .map((e) => CustomAppSecret.fromJson(e))
+      .cast<CustomAppSecret>()
+      .toList();
+}
+
+class AppSecretsScreen extends HookConsumerWidget {
+  final String publisherName;
+  final String projectId;
+  final String appId;
+
+  const AppSecretsScreen({
+    super.key,
+    required this.publisherName,
+    required this.projectId,
+    required this.appId,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final secrets = ref.watch(
+      customAppSecretsProvider(publisherName, projectId, appId),
+    );
+
+    void showNewSecretSheet(String newSecret) {
+      showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder:
+            (context) => SheetScaffold(
+              titleText: 'newSecretGenerated'.tr(),
+              child: Padding(
+                padding: const EdgeInsets.all(20.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text('copySecretHint'.tr()),
+                    const SizedBox(height: 16),
+                    Container(
+                      padding: const EdgeInsets.all(12),
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.surfaceContainer,
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                      child: SelectableText(newSecret),
+                    ),
+                    const SizedBox(height: 20),
+                    FilledButton.icon(
+                      onPressed: () {
+                        Clipboard.setData(ClipboardData(text: newSecret));
+                      },
+                      icon: const Icon(Symbols.copy_all),
+                      label: Text('copy'.tr()),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+      ).whenComplete(() {
+        ref.invalidate(
+          customAppSecretsProvider(publisherName, projectId, appId),
+        );
+      });
+    }
+
+    void createSecret() {
+      showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder: (context) {
+          return HookBuilder(
+            builder: (context) {
+              final descriptionController = useTextEditingController();
+              final expiresInController = useTextEditingController();
+              final isOidc = useState(false);
+
+              return SheetScaffold(
+                titleText: 'generateSecret'.tr(),
+                child: Padding(
+                  padding: const EdgeInsets.all(20.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      TextFormField(
+                        controller: descriptionController,
+                        decoration: InputDecoration(
+                          labelText: 'description'.tr(),
+                        ),
+                        autofocus: true,
+                      ),
+                      const SizedBox(height: 20),
+                      TextFormField(
+                        controller: expiresInController,
+                        decoration: InputDecoration(
+                          labelText: 'expiresIn'.tr(),
+                        ),
+                        keyboardType: TextInputType.number,
+                      ),
+                      const SizedBox(height: 20),
+                      SwitchListTile(
+                        title: Text('isOidc'.tr()),
+                        value: isOidc.value,
+                        onChanged: (value) => isOidc.value = value,
+                      ),
+                      const SizedBox(height: 20),
+                      FilledButton.icon(
+                        onPressed: () async {
+                          final description = descriptionController.text;
+                          final expiresIn = int.tryParse(
+                            expiresInController.text,
+                          );
+                          Navigator.pop(context); // Close the sheet
+                          try {
+                            final client = ref.read(apiClientProvider);
+                            final resp = await client.post(
+                              '/develop/developers/$publisherName/projects/$projectId/apps/$appId/secrets',
+                              data: {
+                                'description': description,
+                                'expires_in': expiresIn,
+                                'is_oidc': isOidc.value,
+                              },
+                            );
+                            final newSecret = CustomAppSecret.fromJson(
+                              resp.data,
+                            );
+                            if (newSecret.secret != null) {
+                              showNewSecretSheet(newSecret.secret!);
+                            }
+                          } catch (e) {
+                            showErrorAlert(e.toString());
+                          }
+                        },
+                        icon: const Icon(Symbols.add),
+                        label: Text('create'.tr()),
+                      ),
+                    ],
+                  ),
+                ),
+              );
+            },
+          );
+        },
+      );
+    }
+
+    return secrets.when(
+      data: (data) {
+        return RefreshIndicator(
+          onRefresh:
+              () => ref.refresh(
+                customAppSecretsProvider(
+                  publisherName,
+                  projectId,
+                  appId,
+                ).future,
+              ),
+          child: Column(
+            children: [
+              ListTile(
+                leading: const Icon(Symbols.add),
+                title: Text('generateSecret'.tr()),
+                onTap: createSecret,
+              ),
+              const Divider(height: 1),
+              Expanded(
+                child: ListView.builder(
+                  padding: EdgeInsets.zero,
+                  itemCount: data.length,
+                  itemBuilder: (context, index) {
+                    final secret = data[index];
+                    return ListTile(
+                      title: Text(secret.description ?? secret.id),
+                      subtitle: Text(
+                        'createdAt'.tr(args: [secret.createdAt.formatSystem()]),
+                      ),
+                      trailing: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          IconButton(
+                            icon: const Icon(Symbols.delete, color: Colors.red),
+                            onPressed: () {
+                              showConfirmAlert(
+                                'deleteSecretHint'.tr(),
+                                'deleteSecret'.tr(),
+                              ).then((confirm) {
+                                if (confirm) {
+                                  final client = ref.read(apiClientProvider);
+                                  client.delete(
+                                    '/develop/developers/$publisherName/projects/$projectId/apps/$appId/secrets/${secret.id}',
+                                  );
+                                  ref.invalidate(
+                                    customAppSecretsProvider(
+                                      publisherName,
+                                      projectId,
+                                      appId,
+                                    ),
+                                  );
+                                }
+                              });
+                            },
+                          ),
+                        ],
+                      ),
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error:
+          (err, stack) => ResponseErrorWidget(
+            error: err,
+            onRetry:
+                () => ref.invalidate(
+                  customAppSecretsProvider(publisherName, projectId, appId),
+                ),
+          ),
+    );
+  }
+}
--- a/lib/screens/developers/app_secrets.g.dart
+++ b/lib/screens/developers/app_secrets.g.dart
@@ -0,0 +1,188 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'app_secrets.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$customAppSecretsHash() => r'1bc62ad812487883ce739793b22a76168d656752';
+
+/// 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));
+  }
+}
+
+/// See also [customAppSecrets].
+@ProviderFor(customAppSecrets)
+const customAppSecretsProvider = CustomAppSecretsFamily();
+
+/// See also [customAppSecrets].
+class CustomAppSecretsFamily extends Family<AsyncValue<List<CustomAppSecret>>> {
+  /// See also [customAppSecrets].
+  const CustomAppSecretsFamily();
+
+  /// See also [customAppSecrets].
+  CustomAppSecretsProvider call(
+    String publisherName,
+    String projectId,
+    String appId,
+  ) {
+    return CustomAppSecretsProvider(publisherName, projectId, appId);
+  }
+
+  @override
+  CustomAppSecretsProvider getProviderOverride(
+    covariant CustomAppSecretsProvider provider,
+  ) {
+    return call(provider.publisherName, provider.projectId, provider.appId);
+  }
+
+  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'customAppSecretsProvider';
+}
+
+/// See also [customAppSecrets].
+class CustomAppSecretsProvider
+    extends AutoDisposeFutureProvider<List<CustomAppSecret>> {
+  /// See also [customAppSecrets].
+  CustomAppSecretsProvider(String publisherName, String projectId, String appId)
+    : this._internal(
+        (ref) => customAppSecrets(
+          ref as CustomAppSecretsRef,
+          publisherName,
+          projectId,
+          appId,
+        ),
+        from: customAppSecretsProvider,
+        name: r'customAppSecretsProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$customAppSecretsHash,
+        dependencies: CustomAppSecretsFamily._dependencies,
+        allTransitiveDependencies:
+            CustomAppSecretsFamily._allTransitiveDependencies,
+        publisherName: publisherName,
+        projectId: projectId,
+        appId: appId,
+      );
+
+  CustomAppSecretsProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.publisherName,
+    required this.projectId,
+    required this.appId,
+  }) : super.internal();
+
+  final String publisherName;
+  final String projectId;
+  final String appId;
+
+  @override
+  Override overrideWith(
+    FutureOr<List<CustomAppSecret>> Function(CustomAppSecretsRef provider)
+    create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: CustomAppSecretsProvider._internal(
+        (ref) => create(ref as CustomAppSecretsRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        publisherName: publisherName,
+        projectId: projectId,
+        appId: appId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<List<CustomAppSecret>> createElement() {
+    return _CustomAppSecretsProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is CustomAppSecretsProvider &&
+        other.publisherName == publisherName &&
+        other.projectId == projectId &&
+        other.appId == appId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, publisherName.hashCode);
+    hash = _SystemHash.combine(hash, projectId.hashCode);
+    hash = _SystemHash.combine(hash, appId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin CustomAppSecretsRef
+    on AutoDisposeFutureProviderRef<List<CustomAppSecret>> {
+  /// The parameter `publisherName` of this provider.
+  String get publisherName;
+
+  /// The parameter `projectId` of this provider.
+  String get projectId;
+
+  /// The parameter `appId` of this provider.
+  String get appId;
+}
+
+class _CustomAppSecretsProviderElement
+    extends AutoDisposeFutureProviderElement<List<CustomAppSecret>>
+    with CustomAppSecretsRef {
+  _CustomAppSecretsProviderElement(super.provider);
+
+  @override
+  String get publisherName =>
+      (origin as CustomAppSecretsProvider).publisherName;
+  @override
+  String get projectId => (origin as CustomAppSecretsProvider).projectId;
+  @override
+  String get appId => (origin as CustomAppSecretsProvider).appId;
+}
+
+// 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/developers/apps.dart
+++ b/lib/screens/developers/apps.dart
@@ -14,6 +14,20 @@ import 'package:styled_widget/styled_widget.dart';

 part 'apps.g.dart';

+@riverpod
+Future<CustomApp> customApp(
+  Ref ref,
+  String publisherName,
+  String projectId,
+  String appId,
+) async {
+  final client = ref.watch(apiClientProvider);
+  final resp = await client.get(
+    '/develop/developers/$publisherName/projects/$projectId/apps/$appId',
+  );
+  return CustomApp.fromJson(resp.data);
+}
+
@riverpod
 Future<List<CustomApp>> customApps(
  Ref ref,
@@ -81,6 +95,18 @@ class CustomAppsScreen extends HookConsumerWidget {
              final app = data[index];
              return Card(
                margin: const EdgeInsets.all(8.0),
+                clipBehavior: Clip.antiAlias,
+                child: InkWell(
+                  onTap: () {
+                    context.pushNamed(
+                      'developerAppDetail',
+                      pathParameters: {
+                        'name': publisherName,
+                        'projectId': projectId,
+                        'appId': app.id,
+                      },
+                    );
+                  },
                  child: Column(
                    children: [
                      SizedBox(
@@ -164,7 +190,10 @@ class CustomAppsScreen extends HookConsumerWidget {
                                    '/develop/developers/$publisherName/projects/$projectId/apps/${app.id}',
                                  );
                                  ref.invalidate(
-                                  customAppsProvider(publisherName, projectId),
+                                    customAppsProvider(
+                                      publisherName,
+                                      projectId,
+                                    ),
                                  );
                                }
                              });
@@ -174,6 +203,7 @@ class CustomAppsScreen extends HookConsumerWidget {
                      ),
                    ],
                  ),
+                ),
              );
            },
          ),
--- a/lib/screens/developers/apps.g.dart
+++ b/lib/screens/developers/apps.g.dart
@@ -6,7 +6,7 @@ part of 'apps.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$customAppsHash() => r'450bedaf4220b8963cb44afeb14d4c0e80f01b11';
+String _$customAppHash() => r'be05431ba8bf06fd20ee988a61c3663a68e15fc9';

 /// Copied from Dart SDK
 class _SystemHash {
@@ -29,6 +29,148 @@ class _SystemHash {
  }
 }

+/// See also [customApp].
+@ProviderFor(customApp)
+const customAppProvider = CustomAppFamily();
+
+/// See also [customApp].
+class CustomAppFamily extends Family<AsyncValue<CustomApp>> {
+  /// See also [customApp].
+  const CustomAppFamily();
+
+  /// See also [customApp].
+  CustomAppProvider call(String publisherName, String projectId, String appId) {
+    return CustomAppProvider(publisherName, projectId, appId);
+  }
+
+  @override
+  CustomAppProvider getProviderOverride(covariant CustomAppProvider provider) {
+    return call(provider.publisherName, provider.projectId, provider.appId);
+  }
+
+  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'customAppProvider';
+}
+
+/// See also [customApp].
+class CustomAppProvider extends AutoDisposeFutureProvider<CustomApp> {
+  /// See also [customApp].
+  CustomAppProvider(String publisherName, String projectId, String appId)
+    : this._internal(
+        (ref) =>
+            customApp(ref as CustomAppRef, publisherName, projectId, appId),
+        from: customAppProvider,
+        name: r'customAppProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$customAppHash,
+        dependencies: CustomAppFamily._dependencies,
+        allTransitiveDependencies: CustomAppFamily._allTransitiveDependencies,
+        publisherName: publisherName,
+        projectId: projectId,
+        appId: appId,
+      );
+
+  CustomAppProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.publisherName,
+    required this.projectId,
+    required this.appId,
+  }) : super.internal();
+
+  final String publisherName;
+  final String projectId;
+  final String appId;
+
+  @override
+  Override overrideWith(
+    FutureOr<CustomApp> Function(CustomAppRef provider) create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: CustomAppProvider._internal(
+        (ref) => create(ref as CustomAppRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        publisherName: publisherName,
+        projectId: projectId,
+        appId: appId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<CustomApp> createElement() {
+    return _CustomAppProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is CustomAppProvider &&
+        other.publisherName == publisherName &&
+        other.projectId == projectId &&
+        other.appId == appId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, publisherName.hashCode);
+    hash = _SystemHash.combine(hash, projectId.hashCode);
+    hash = _SystemHash.combine(hash, appId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin CustomAppRef on AutoDisposeFutureProviderRef<CustomApp> {
+  /// The parameter `publisherName` of this provider.
+  String get publisherName;
+
+  /// The parameter `projectId` of this provider.
+  String get projectId;
+
+  /// The parameter `appId` of this provider.
+  String get appId;
+}
+
+class _CustomAppProviderElement
+    extends AutoDisposeFutureProviderElement<CustomApp>
+    with CustomAppRef {
+  _CustomAppProviderElement(super.provider);
+
+  @override
+  String get publisherName => (origin as CustomAppProvider).publisherName;
+  @override
+  String get projectId => (origin as CustomAppProvider).projectId;
+  @override
+  String get appId => (origin as CustomAppProvider).appId;
+}
+
+String _$customAppsHash() => r'450bedaf4220b8963cb44afeb14d4c0e80f01b11';
+
 /// See also [customApps].
@ProviderFor(customApps)
 const customAppsProvider = CustomAppsFamily();
--- a/lib/screens/developers/edit_app.dart
+++ b/lib/screens/developers/edit_app.dart
@@ -297,6 +297,8 @@ class EditAppScreen extends HookConsumerWidget {
                }
                : null,
      };
+      try {
+        showLoadingModal(context);
        if (isNew) {
          await client.post(
            '/develop/developers/$publisherName/projects/$projectId/apps',
@@ -308,6 +310,12 @@ class EditAppScreen extends HookConsumerWidget {
            data: data,
          );
        }
+      } catch (err) {
+        showErrorAlert(err);
+        return;
+      } finally {
+        if (context.mounted) hideLoadingModal(context);
+      }
      ref.invalidate(customAppsProvider(publisherName, projectId));
      if (context.mounted) {
        Navigator.pop(context);
--- a/lib/screens/discovery/articles.dart
+++ b/lib/screens/discovery/articles.dart
@@ -101,7 +101,7 @@ class SliverArticlesList extends ConsumerWidget {
            publisherId: publisherId,
          ).notifier,
      contentBuilder:
-          (data, widgetCount, endItemView) => SliverList.builder(
+          (data, widgetCount, endItemView) => SliverList.separated(
            itemCount: widgetCount,
            itemBuilder: (context, index) {
              if (index == widgetCount - 1) {
@@ -111,38 +111,95 @@ class SliverArticlesList extends ConsumerWidget {
              final article = data.items[index];
              return WebArticleCard(article: article, showDetails: true);
            },
+            separatorBuilder: (context, index) => const SizedBox(height: 12),
          ),
    );
  }
 }

-class ArticlesScreen extends ConsumerWidget {
-  final String? feedId;
-  final String? publisherId;
-  final String? title;
+@riverpod
+Future<List<SnWebFeed>> subscribedFeeds(Ref ref) async {
+  final client = ref.watch(apiClientProvider);
+  final response = await client.get('/sphere/feeds/subscribed');
+  final data = response.data as List<dynamic>;
+  return data.map((json) => SnWebFeed.fromJson(json)).toList();
+}

-  const ArticlesScreen({super.key, this.feedId, this.publisherId, this.title});
+class ArticlesScreen extends ConsumerWidget {
+  const ArticlesScreen({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    return AppScaffold(
-      appBar: AppBar(title: Text(title ?? 'Articles')),
-      body: Center(
+    final subscribedFeedsAsync = ref.watch(subscribedFeedsProvider);
+
+    return subscribedFeedsAsync.when(
+      data: (feeds) {
+        return DefaultTabController(
+          length: feeds.length + 1,
+          child: AppScaffold(
+            appBar: AppBar(
+              title: const Text('Articles'),
+              bottom: TabBar(
+                isScrollable: true,
+                tabs: [
+                  const Tab(text: 'All'),
+                  ...feeds.map((feed) => Tab(text: feed.title)),
+                ],
+              ),
+            ),
+            body: TabBarView(
+              children: [
+                Center(
                  child: ConstrainedBox(
                    constraints: const BoxConstraints(maxWidth: 560),
                    child: CustomScrollView(
                      slivers: [
                        SliverPadding(
-                padding: const EdgeInsets.only(top: 8, left: 8, right: 8),
-                sliver: SliverArticlesList(
-                  feedId: feedId,
-                  publisherId: publisherId,
+                          padding: const EdgeInsets.only(
+                            top: 12,
+                            left: 8,
+                            right: 8,
                          ),
+                          sliver: SliverArticlesList(),
                        ),
                      ],
                    ),
                  ),
                ),
+                ...feeds.map((feed) {
+                  return Center(
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: 560),
+                      child: CustomScrollView(
+                        slivers: [
+                          SliverPadding(
+                            padding: const EdgeInsets.only(
+                              top: 8,
+                              left: 8,
+                              right: 8,
+                            ),
+                            sliver: SliverArticlesList(feedId: feed.id),
+                          ),
+                        ],
+                      ),
+                    ),
+                  );
+                }),
+              ],
+            ),
+          ),
+        );
+      },
+      loading:
+          () => AppScaffold(
+            appBar: AppBar(title: const Text('Articles')),
+            body: const Center(child: CircularProgressIndicator()),
+          ),
+      error:
+          (err, stack) => AppScaffold(
+            appBar: AppBar(title: const Text('Articles')),
+            body: Center(child: Text('Error: $err')),
+          ),
    );
  }
 }
--- a/lib/screens/discovery/articles.g.dart
+++ b/lib/screens/discovery/articles.g.dart
@@ -6,6 +6,25 @@ part of 'articles.dart';
 // RiverpodGenerator
 // **************************************************************************

+String _$subscribedFeedsHash() => r'5c0c8c30c5f543f6ea1d39786a6778f77ba5b3df';
+
+/// See also [subscribedFeeds].
+@ProviderFor(subscribedFeeds)
+final subscribedFeedsProvider =
+    AutoDisposeFutureProvider<List<SnWebFeed>>.internal(
+      subscribedFeeds,
+      name: r'subscribedFeedsProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$subscribedFeedsHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef SubscribedFeedsRef = AutoDisposeFutureProviderRef<List<SnWebFeed>>;
 String _$articlesListNotifierHash() =>
    r'579741af4d90c7c81f2e2697e57c4895b7a9dabc';

--- a/lib/screens/discovery/feeds/feed_detail.dart
+++ b/lib/screens/discovery/feeds/feed_detail.dart
@@ -1,27 +1,75 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/webfeed.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/widgets/alert.dart';
 import 'package:island/widgets/app_scaffold.dart';
+import 'package:island/widgets/web_article_card.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 'feed_detail.g.dart';

+@riverpod
+Future<SnWebFeed> marketplaceWebFeed(Ref ref, String feedId) async {
+  final apiClient = ref.watch(apiClientProvider);
+  final resp = await apiClient.get('/sphere/feeds/$feedId');
+  return SnWebFeed.fromJson(resp.data);
+}
+
 /// Provider for web feed articles content
@riverpod
-Future<List<SnWebArticle>> marketplaceWebFeedContent(
-  Ref ref, {
-  required String feedId,
+class MarketplaceWebFeedContentNotifier
+    extends _$MarketplaceWebFeedContentNotifier
+    with CursorPagingNotifierMixin<SnWebArticle> {
+  static const int _pageSize = 20;
+
+  @override
+  Future<CursorPagingData<SnWebArticle>> build(String feedId) async {
+    _feedId = feedId;
+    return fetch(cursor: null);
+  }
+
+  late final String _feedId;
+  ValueNotifier<int> totalCount = ValueNotifier(0);
+
+  @override
+  Future<CursorPagingData<SnWebArticle>> fetch({
+    required String? cursor,
  }) async {
-  final apiClient = ref.watch(apiClientProvider);
-  final resp = await apiClient.get('/sphere/feeds/$feedId/articles');
-  return (resp.data as List).map((e) => SnWebArticle.fromJson(e)).toList();
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);
+
+    final queryParams = {'offset': offset, 'take': _pageSize};
+
+    final response = await client.get(
+      '/sphere/feeds/$_feedId/articles',
+      queryParameters: queryParams,
+    );
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    totalCount.value = total;
+    final List<dynamic> data = response.data;
+    final articles = data.map((json) => SnWebArticle.fromJson(json)).toList();
+
+    final hasMore = offset + articles.length < total;
+    final nextCursor = hasMore ? (offset + articles.length).toString() : null;
+
+    return CursorPagingData(
+      items: articles,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+
+  void dispose() {
+    totalCount.dispose();
+  }
 }

 /// Provider for web feed subscription status
@@ -49,11 +97,7 @@ class MarketplaceWebFeedDetailScreen extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    // TODO: Need to create a web feed provider similar to stickerPackProvider
-    // For now, we'll fetch the feed directly
-    final feedContent = ref.watch(
-      marketplaceWebFeedContentProvider(feedId: id),
-    );
+    final feed = ref.watch(marketplaceWebFeedProvider(id));
    final subscribed = ref.watch(
      marketplaceWebFeedSubscriptionProvider(feedId: id),
    );
@@ -65,7 +109,7 @@ class MarketplaceWebFeedDetailScreen extends HookConsumerWidget {
      HapticFeedback.selectionClick();
      ref.invalidate(marketplaceWebFeedSubscriptionProvider(feedId: id));
      if (!context.mounted) return;
-      showSnackBar('feedSubscribed'.tr());
+      showSnackBar('webFeedSubscribed'.tr());
    }

    // Unsubscribe from web feed
@@ -75,86 +119,94 @@ class MarketplaceWebFeedDetailScreen extends HookConsumerWidget {
      HapticFeedback.selectionClick();
      ref.invalidate(marketplaceWebFeedSubscriptionProvider(feedId: id));
      if (!context.mounted) return;
-      showSnackBar('feedUnsubscribed'.tr());
+      showSnackBar('webFeedUnsubscribed'.tr());
    }

-    // TODO: Replace with actual feed data provider once created
-    final dummyFeed = SnWebFeed(
-      id: id,
-      url: 'https://example.com',
-      title: 'Loading...',
-      publisherId: 'publisher-id',
-      createdAt: DateTime.now(),
-      updatedAt: DateTime.now(),
+    final feedNotifier = ref.watch(
+      marketplaceWebFeedContentNotifierProvider(id).notifier,
    );

+    useEffect(() {
+      return feedNotifier.dispose;
+    }, []);
+
    return AppScaffold(
-      appBar: AppBar(title: Text(dummyFeed.title)),
+      appBar: AppBar(title: Text(feed.value?.title ?? 'loading'.tr())),
      body: Column(
        crossAxisAlignment: CrossAxisAlignment.stretch,
        children: [
          // Feed meta
-          Column(
+          feed
+              .when(
+                data:
+                    (data) => Column(
                      crossAxisAlignment: CrossAxisAlignment.stretch,
                      children: [
-              Text(dummyFeed.description ?? ''),
+                        Text(data.description ?? 'descriptionNone'.tr()),
                        Row(
                          spacing: 4,
                          children: [
                            const Icon(Symbols.rss_feed, size: 16),
-                  Text('${feedContent.value?.length ?? 0} articles'),
+                            ListenableBuilder(
+                              listenable: feedNotifier.totalCount,
+                              builder:
+                                  (context, _) => Text(
+                                    'webFeedArticleCount'.plural(
+                                      feedNotifier.totalCount.value,
+                                    ),
+                                  ),
+                            ),
                          ],
                        ).opacity(0.85),
                        Row(
                          spacing: 4,
                          children: [
                            const Icon(Symbols.link, size: 16),
-                  SelectableText(dummyFeed.url),
+                            SelectableText(data.url),
                          ],
                        ).opacity(0.85),
                      ],
-          ).padding(horizontal: 24, vertical: 24),
+                    ),
+                error: (err, _) => Text(err.toString()),
+                loading: () => CircularProgressIndicator().center(),
+              )
+              .padding(horizontal: 24, vertical: 24),
          const Divider(height: 1),
          // Articles list
          Expanded(
-            child: feedContent.when(
-              data:
-                  (articles) => RefreshIndicator(
-                    onRefresh:
-                        () => ref.refresh(
-                          marketplaceWebFeedContentProvider(feedId: id).future,
-                        ),
-                    child: ListView.builder(
+            child: PagingHelperView(
+              provider: marketplaceWebFeedContentNotifierProvider(id),
+              futureRefreshable:
+                  marketplaceWebFeedContentNotifierProvider(id).future,
+              notifierRefreshable:
+                  marketplaceWebFeedContentNotifierProvider(id).notifier,
+              contentBuilder:
+                  (data, widgetCount, endItemView) => ListView.separated(
                    padding: const EdgeInsets.symmetric(
                      horizontal: 24,
                      vertical: 20,
                    ),
-                      itemCount: articles.length,
+                    itemCount: widgetCount,
                    itemBuilder: (context, index) {
-                        final article = articles[index];
-                        return Card(
-                          child: ListTile(
-                            title: Text(article.title),
-                            subtitle: Text(article.author ?? ''),
-                            trailing: const Icon(Symbols.open_in_new),
-                            onTap: () {
-                              // TODO: Navigate to article detail or open URL
-                            },
-                          ),
-                        );
+                      if (index == widgetCount - 1) {
+                        return endItemView;
+                      }
+
+                      final article = data.items[index];
+                      return WebArticleCard(article: article);
                    },
+                    separatorBuilder: (context, index) => const Gap(12),
                  ),
            ),
-              error:
-                  (err, _) =>
-                      Text(
-                        'Error: $err',
-                      ).textAlignment(TextAlign.center).center(),
-              loading: () => const CircularProgressIndicator().center(),
          ),
+          Container(
+            padding: EdgeInsets.only(
+              bottom: 16 + MediaQuery.of(context).padding.bottom,
+              left: 24,
+              right: 24,
+              top: 16,
            ),
-          Padding(
-            padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+            color: Theme.of(context).colorScheme.surfaceContainer,
            child: subscribed.when(
              data:
                  (isSubscribed) => FilledButton.icon(
@@ -181,7 +233,6 @@ class MarketplaceWebFeedDetailScreen extends HookConsumerWidget {
                  ),
            ),
          ),
-          Gap(MediaQuery.of(context).padding.bottom),
        ],
      ),
    );
--- a/lib/screens/discovery/feeds/feed_detail.g.dart
+++ b/lib/screens/discovery/feeds/feed_detail.g.dart
@@ -6,8 +6,8 @@ part of 'feed_detail.dart';
 // RiverpodGenerator
 // **************************************************************************

-String _$marketplaceWebFeedContentHash() =>
-    r'4e65350bff4055302e15ec14266cdebb1cd89bbe';
+String _$marketplaceWebFeedHash() =>
+    r'8383f94f1bc272b903c341b8d95000313b69d14c';

 /// Copied from Dart SDK
 class _SystemHash {
@@ -30,34 +30,25 @@ class _SystemHash {
  }
 }

-/// Provider for web feed articles content
-///
-/// Copied from [marketplaceWebFeedContent].
-@ProviderFor(marketplaceWebFeedContent)
-const marketplaceWebFeedContentProvider = MarketplaceWebFeedContentFamily();
+/// See also [marketplaceWebFeed].
+@ProviderFor(marketplaceWebFeed)
+const marketplaceWebFeedProvider = MarketplaceWebFeedFamily();

-/// Provider for web feed articles content
-///
-/// Copied from [marketplaceWebFeedContent].
-class MarketplaceWebFeedContentFamily
-    extends Family<AsyncValue<List<SnWebArticle>>> {
-  /// Provider for web feed articles content
-  ///
-  /// Copied from [marketplaceWebFeedContent].
-  const MarketplaceWebFeedContentFamily();
+/// See also [marketplaceWebFeed].
+class MarketplaceWebFeedFamily extends Family<AsyncValue<SnWebFeed>> {
+  /// See also [marketplaceWebFeed].
+  const MarketplaceWebFeedFamily();

-  /// Provider for web feed articles content
-  ///
-  /// Copied from [marketplaceWebFeedContent].
-  MarketplaceWebFeedContentProvider call({required String feedId}) {
-    return MarketplaceWebFeedContentProvider(feedId: feedId);
+  /// See also [marketplaceWebFeed].
+  MarketplaceWebFeedProvider call(String feedId) {
+    return MarketplaceWebFeedProvider(feedId);
  }

  @override
-  MarketplaceWebFeedContentProvider getProviderOverride(
-    covariant MarketplaceWebFeedContentProvider provider,
+  MarketplaceWebFeedProvider getProviderOverride(
+    covariant MarketplaceWebFeedProvider provider,
  ) {
-    return call(feedId: provider.feedId);
+    return call(provider.feedId);
  }

  static const Iterable<ProviderOrFamily>? _dependencies = null;
@@ -72,36 +63,28 @@ class MarketplaceWebFeedContentFamily
      _allTransitiveDependencies;

  @override
-  String? get name => r'marketplaceWebFeedContentProvider';
+  String? get name => r'marketplaceWebFeedProvider';
 }

-/// Provider for web feed articles content
-///
-/// Copied from [marketplaceWebFeedContent].
-class MarketplaceWebFeedContentProvider
-    extends AutoDisposeFutureProvider<List<SnWebArticle>> {
-  /// Provider for web feed articles content
-  ///
-  /// Copied from [marketplaceWebFeedContent].
-  MarketplaceWebFeedContentProvider({required String feedId})
+/// See also [marketplaceWebFeed].
+class MarketplaceWebFeedProvider extends AutoDisposeFutureProvider<SnWebFeed> {
+  /// See also [marketplaceWebFeed].
+  MarketplaceWebFeedProvider(String feedId)
    : this._internal(
-        (ref) => marketplaceWebFeedContent(
-          ref as MarketplaceWebFeedContentRef,
-          feedId: feedId,
-        ),
-        from: marketplaceWebFeedContentProvider,
-        name: r'marketplaceWebFeedContentProvider',
+        (ref) => marketplaceWebFeed(ref as MarketplaceWebFeedRef, feedId),
+        from: marketplaceWebFeedProvider,
+        name: r'marketplaceWebFeedProvider',
        debugGetCreateSourceHash:
            const bool.fromEnvironment('dart.vm.product')
                ? null
-                : _$marketplaceWebFeedContentHash,
-        dependencies: MarketplaceWebFeedContentFamily._dependencies,
+                : _$marketplaceWebFeedHash,
+        dependencies: MarketplaceWebFeedFamily._dependencies,
        allTransitiveDependencies:
-            MarketplaceWebFeedContentFamily._allTransitiveDependencies,
+            MarketplaceWebFeedFamily._allTransitiveDependencies,
        feedId: feedId,
      );

-  MarketplaceWebFeedContentProvider._internal(
+  MarketplaceWebFeedProvider._internal(
    super._createNotifier, {
    required super.name,
    required super.dependencies,
@@ -115,13 +98,12 @@ class MarketplaceWebFeedContentProvider

  @override
  Override overrideWith(
-    FutureOr<List<SnWebArticle>> Function(MarketplaceWebFeedContentRef provider)
-    create,
+    FutureOr<SnWebFeed> Function(MarketplaceWebFeedRef provider) create,
  ) {
    return ProviderOverride(
      origin: this,
-      override: MarketplaceWebFeedContentProvider._internal(
-        (ref) => create(ref as MarketplaceWebFeedContentRef),
+      override: MarketplaceWebFeedProvider._internal(
+        (ref) => create(ref as MarketplaceWebFeedRef),
        from: from,
        name: null,
        dependencies: null,
@@ -133,13 +115,13 @@ class MarketplaceWebFeedContentProvider
  }

  @override
-  AutoDisposeFutureProviderElement<List<SnWebArticle>> createElement() {
-    return _MarketplaceWebFeedContentProviderElement(this);
+  AutoDisposeFutureProviderElement<SnWebFeed> createElement() {
+    return _MarketplaceWebFeedProviderElement(this);
  }

  @override
  bool operator ==(Object other) {
-    return other is MarketplaceWebFeedContentProvider && other.feedId == feedId;
+    return other is MarketplaceWebFeedProvider && other.feedId == feedId;
  }

  @override
@@ -153,19 +135,18 @@ class MarketplaceWebFeedContentProvider

@Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
-mixin MarketplaceWebFeedContentRef
-    on AutoDisposeFutureProviderRef<List<SnWebArticle>> {
+mixin MarketplaceWebFeedRef on AutoDisposeFutureProviderRef<SnWebFeed> {
  /// The parameter `feedId` of this provider.
  String get feedId;
 }

-class _MarketplaceWebFeedContentProviderElement
-    extends AutoDisposeFutureProviderElement<List<SnWebArticle>>
-    with MarketplaceWebFeedContentRef {
-  _MarketplaceWebFeedContentProviderElement(super.provider);
+class _MarketplaceWebFeedProviderElement
+    extends AutoDisposeFutureProviderElement<SnWebFeed>
+    with MarketplaceWebFeedRef {
+  _MarketplaceWebFeedProviderElement(super.provider);

  @override
-  String get feedId => (origin as MarketplaceWebFeedContentProvider).feedId;
+  String get feedId => (origin as MarketplaceWebFeedProvider).feedId;
 }

 String _$marketplaceWebFeedSubscriptionHash() =>
@@ -309,5 +290,169 @@ class _MarketplaceWebFeedSubscriptionProviderElement
      (origin as MarketplaceWebFeedSubscriptionProvider).feedId;
 }

+String _$marketplaceWebFeedContentNotifierHash() =>
+    r'25688082884cb824eeff300888ba38c9748295dc';
+
+abstract class _$MarketplaceWebFeedContentNotifier
+    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnWebArticle>> {
+  late final String feedId;
+
+  FutureOr<CursorPagingData<SnWebArticle>> build(String feedId);
+}
+
+/// Provider for web feed articles content
+///
+/// Copied from [MarketplaceWebFeedContentNotifier].
+@ProviderFor(MarketplaceWebFeedContentNotifier)
+const marketplaceWebFeedContentNotifierProvider =
+    MarketplaceWebFeedContentNotifierFamily();
+
+/// Provider for web feed articles content
+///
+/// Copied from [MarketplaceWebFeedContentNotifier].
+class MarketplaceWebFeedContentNotifierFamily
+    extends Family<AsyncValue<CursorPagingData<SnWebArticle>>> {
+  /// Provider for web feed articles content
+  ///
+  /// Copied from [MarketplaceWebFeedContentNotifier].
+  const MarketplaceWebFeedContentNotifierFamily();
+
+  /// Provider for web feed articles content
+  ///
+  /// Copied from [MarketplaceWebFeedContentNotifier].
+  MarketplaceWebFeedContentNotifierProvider call(String feedId) {
+    return MarketplaceWebFeedContentNotifierProvider(feedId);
+  }
+
+  @override
+  MarketplaceWebFeedContentNotifierProvider getProviderOverride(
+    covariant MarketplaceWebFeedContentNotifierProvider provider,
+  ) {
+    return call(provider.feedId);
+  }
+
+  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'marketplaceWebFeedContentNotifierProvider';
+}
+
+/// Provider for web feed articles content
+///
+/// Copied from [MarketplaceWebFeedContentNotifier].
+class MarketplaceWebFeedContentNotifierProvider
+    extends
+        AutoDisposeAsyncNotifierProviderImpl<
+          MarketplaceWebFeedContentNotifier,
+          CursorPagingData<SnWebArticle>
+        > {
+  /// Provider for web feed articles content
+  ///
+  /// Copied from [MarketplaceWebFeedContentNotifier].
+  MarketplaceWebFeedContentNotifierProvider(String feedId)
+    : this._internal(
+        () => MarketplaceWebFeedContentNotifier()..feedId = feedId,
+        from: marketplaceWebFeedContentNotifierProvider,
+        name: r'marketplaceWebFeedContentNotifierProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$marketplaceWebFeedContentNotifierHash,
+        dependencies: MarketplaceWebFeedContentNotifierFamily._dependencies,
+        allTransitiveDependencies:
+            MarketplaceWebFeedContentNotifierFamily._allTransitiveDependencies,
+        feedId: feedId,
+      );
+
+  MarketplaceWebFeedContentNotifierProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.feedId,
+  }) : super.internal();
+
+  final String feedId;
+
+  @override
+  FutureOr<CursorPagingData<SnWebArticle>> runNotifierBuild(
+    covariant MarketplaceWebFeedContentNotifier notifier,
+  ) {
+    return notifier.build(feedId);
+  }
+
+  @override
+  Override overrideWith(MarketplaceWebFeedContentNotifier Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: MarketplaceWebFeedContentNotifierProvider._internal(
+        () => create()..feedId = feedId,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        feedId: feedId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeAsyncNotifierProviderElement<
+    MarketplaceWebFeedContentNotifier,
+    CursorPagingData<SnWebArticle>
+  >
+  createElement() {
+    return _MarketplaceWebFeedContentNotifierProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is MarketplaceWebFeedContentNotifierProvider &&
+        other.feedId == feedId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, feedId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin MarketplaceWebFeedContentNotifierRef
+    on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnWebArticle>> {
+  /// The parameter `feedId` of this provider.
+  String get feedId;
+}
+
+class _MarketplaceWebFeedContentNotifierProviderElement
+    extends
+        AutoDisposeAsyncNotifierProviderElement<
+          MarketplaceWebFeedContentNotifier,
+          CursorPagingData<SnWebArticle>
+        >
+    with MarketplaceWebFeedContentNotifierRef {
+  _MarketplaceWebFeedContentNotifierProviderElement(super.provider);
+
+  @override
+  String get feedId =>
+      (origin as MarketplaceWebFeedContentNotifierProvider).feedId;
+}
+
 // 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/discovery/feeds/feed_marketplace.g.dart
+++ b/lib/screens/discovery/feeds/feed_marketplace.g.dart
@@ -7,7 +7,7 @@ part of 'feed_marketplace.dart';
 // **************************************************************************

 String _$marketplaceWebFeedsNotifierHash() =>
-    r'dbf885d95570ca9c2259a58998975db813b18cbb';
+    r'774b2985f2f7d61fe958f534f84e39f814327c4e';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/screens/realm/realm_detail.dart
+++ b/lib/screens/realm/realm_detail.dart
@@ -520,9 +520,11 @@ class _RealmActionMenu extends HookConsumerWidget {
 class RealmMemberListNotifier extends _$RealmMemberListNotifier
    with CursorPagingNotifierMixin<SnRealmMember> {
  static const int _pageSize = 20;
+  ValueNotifier<int> totalCount = ValueNotifier(0);

  @override
  Future<CursorPagingData<SnRealmMember>> build(String realmSlug) async {
+    totalCount.value = 0;
    return fetch();
  }

@@ -541,6 +543,7 @@ class RealmMemberListNotifier extends _$RealmMemberListNotifier
    );

    final total = int.parse(response.headers.value('X-Total') ?? '0');
+    totalCount.value = total;
    final List<dynamic> data = response.data;
    final members = data.map((e) => SnRealmMember.fromJson(e)).toList();

@@ -553,52 +556,9 @@ class RealmMemberListNotifier extends _$RealmMemberListNotifier
      nextCursor: nextCursor,
    );
  }
-}

-// Keep the old provider for backward compatibility
-final realmMemberStateProvider =
-    StateNotifierProvider.family<RealmMemberNotifier, RealmMemberState, String>(
-      (ref, realmSlug) {
-        final apiClient = ref.watch(apiClientProvider);
-        return RealmMemberNotifier(apiClient, realmSlug);
-      },
-    );
-
-class RealmMemberNotifier extends StateNotifier<RealmMemberState> {
-  final String realmSlug;
-  final Dio _apiClient;
-
-  RealmMemberNotifier(this._apiClient, this.realmSlug)
-    : super(const RealmMemberState(members: [], isLoading: false, total: 0));
-
-  Future<void> loadMore({int offset = 0, int take = 20}) async {
-    if (state.isLoading) return;
-    if (state.total > 0 && state.members.length >= state.total) return;
-
-    state = state.copyWith(isLoading: true, error: null);
-
-    try {
-      final response = await _apiClient.get(
-        '/sphere/realms/$realmSlug/members',
-        queryParameters: {'offset': offset, 'take': take, 'withStatus': true},
-      );
-
-      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();
-
-      state = state.copyWith(
-        members: [...state.members, ...members],
-        total: total,
-        isLoading: false,
-      );
-    } catch (e) {
-      state = state.copyWith(error: e.toString(), isLoading: false);
-    }
-  }
-
-  void reset() {
-    state = const RealmMemberState(members: [], isLoading: false, total: 0);
+  void dispose() {
+    totalCount.dispose();
  }
 }

@@ -610,18 +570,10 @@ class _RealmMemberListSheet extends HookConsumerWidget {
  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 memberListNotifier = ref.watch(memberListProvider.notifier);

    useEffect(() {
-      Future(() {
-        memberNotifier.loadMore();
-      });
-      return null;
+      return memberListNotifier.dispose;
    }, []);

    Future<void> invitePerson() async {
@@ -638,9 +590,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
          '/sphere/realms/invites/$realmSlug',
          data: {'related_user_id': result.id, 'role': 0},
        );
-        // Refresh both providers
-        memberNotifier.reset();
-        await memberNotifier.loadMore();
+        // Refresh the provider
        ref.invalidate(memberListProvider);
      } catch (err) {
        showErrorAlert(err);
@@ -652,13 +602,18 @@ class _RealmMemberListSheet extends HookConsumerWidget {
        padding: EdgeInsets.only(top: 16, left: 20, right: 16, bottom: 12),
        child: Row(
          children: [
-            Text(
-              'members'.plural(memberState.total),
+            ListenableBuilder(
+              listenable: memberListNotifier.totalCount,
+              builder:
+                  (context, _) => Text(
+                    'members'.plural(memberListNotifier.totalCount.value),
+                    key: ValueKey(memberListNotifier),
                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                      fontWeight: FontWeight.w600,
                      letterSpacing: -0.5,
                    ),
                  ),
+            ),
            const Spacer(),
            IconButton(
              icon: const Icon(Symbols.person_add),
@@ -668,9 +623,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
            IconButton(
              icon: const Icon(Symbols.refresh),
              onPressed: () {
-                // Refresh both providers
-                memberNotifier.reset();
-                memberNotifier.loadMore();
+                // Refresh the provider
                ref.invalidate(memberListProvider);
              },
            ),
@@ -744,9 +697,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                                  ),
                            ).then((value) {
                              if (value != null) {
-                                // Refresh both providers
-                                memberNotifier.reset();
-                                memberNotifier.loadMore();
+                                // Refresh the provider
                                ref.invalidate(memberListProvider);
                              }
                            });
@@ -766,9 +717,7 @@ class _RealmMemberListSheet extends HookConsumerWidget {
                                await apiClient.delete(
                                  '/sphere/realms/$realmSlug/members/${member.accountId}',
                                );
-                                // Refresh both providers
-                                memberNotifier.reset();
-                                memberNotifier.loadMore();
+                                // Refresh the provider
                                ref.invalidate(memberListProvider);
                              } catch (err) {
                                showErrorAlert(err);
@@ -801,34 +750,6 @@ class _RealmMemberListSheet extends HookConsumerWidget {
  }
 }

-class RealmMemberState {
-  final List<SnRealmMember> members;
-  final bool isLoading;
-  final int total;
-  final String? error;
-
-  const RealmMemberState({
-    required this.members,
-    required this.isLoading,
-    required this.total,
-    this.error,
-  });
-
-  RealmMemberState copyWith({
-    List<SnRealmMember>? members,
-    bool? isLoading,
-    int? total,
-    String? error,
-  }) {
-    return RealmMemberState(
-      members: members ?? this.members,
-      isLoading: isLoading ?? this.isLoading,
-      total: total ?? this.total,
-      error: error ?? this.error,
-    );
-  }
-}
-
 class _RealmMemberRoleSheet extends HookConsumerWidget {
  final String realmSlug;
  final SnRealmMember member;
--- a/lib/screens/realm/realm_detail.g.dart
+++ b/lib/screens/realm/realm_detail.g.dart
@@ -399,7 +399,7 @@ class _RealmChatRoomsProviderElement
 }

 String _$realmMemberListNotifierHash() =>
-    r'2f88f803b2e61e7287ed8a43025173e56ff6ca3b';
+    r'db1fd8a6741dfb3d5bb921d5d965f0cfdc0e7bcc';

 abstract class _$RealmMemberListNotifier
    extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnRealmMember>> {
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 3.2.0+127
+version: 3.2.0+128

 environment:
  sdk: ^3.7.2
--- a/swagger.json
+++ b/swagger.json
Author	SHA1	Message	Date
LittleSheep	06f04eb3a5	🎉 Launch 3.2.0+128	2025-08-25 01:55:54 +08:00
LittleSheep	8af97e43b4	💄 Optimize articles view	2025-08-25 01:48:43 +08:00
LittleSheep	d1e8234b93	🐛 Fix bugs	2025-08-24 23:50:36 +08:00
LittleSheep	a03d6015a6	✨ Manage secret	2025-08-24 23:46:14 +08:00
LittleSheep	246ac52d0a	✨ Custom app detail page	2025-08-24 22:33:41 +08:00
LittleSheep	abf395ff9a	🐛 Dozens of bug fixes	2025-08-24 21:49:40 +08:00
LittleSheep	4fdc8eb1d0	✨ Feed discover and subscription	2025-08-24 13:55:06 +08:00