improve following in the sample app

renefloor · renefloor · commit 6e15d383c5d8 · 2025-10-21T12:06:18.000+02:00
diff --git a/packages/stream_feeds/lib/src/models/feed_id.dart b/packages/stream_feeds/lib/src/models/feed_id.dart
@@ -14,6 +14,21 @@ class FeedId with _$FeedId {
     required this.id,
   }) : rawValue = '$group:$id';
 
+  /// The user's timeline feed containing posts from followed users
+  const FeedId.timeline(String id) : this(group: 'timeline', id: id);
+
+  /// Notifications feed
+  const FeedId.notification(String id) : this(group: 'notification', id: id);
+
+  /// The user's feed containing stories from followed users
+  const FeedId.stories(String id) : this(group: 'stories', id: id);
+
+  /// The user's own stories
+  const FeedId.story(String id) : this(group: 'story', id: id);
+
+  /// TThe user's own posts
+  const FeedId.user(String id) : this(group: 'user', id: id);
+
   /// Creates a feed identifier from a raw string value.
   ///
   /// The string should be in the format `"group:id"`. If the string
diff --git a/packages/stream_feeds/lib/src/state/feed_state.dart b/packages/stream_feeds/lib/src/state/feed_state.dart
@@ -349,21 +349,29 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     }
 
     if (follow.isFollowingFeed(state.fid)) {
+      final updatedCount = follow.sourceFeed.followingCount;
       final updatedFollowing = state.following.upsert(
         follow,
         key: (it) => it.id,
       );
 
-      return state.copyWith(following: updatedFollowing);
+      return state.copyWith(
+        following: updatedFollowing,
+        feed: state.feed?.copyWith(followingCount: updatedCount),
+      );
     }
 
     if (follow.isFollowerOf(state.fid)) {
+      final updatedCount = follow.targetFeed.followerCount;
       final updatedFollowers = state.followers.upsert(
         follow,
         key: (it) => it.id,
       );
 
-      return state.copyWith(followers: updatedFollowers);
+      return state.copyWith(
+        followers: updatedFollowers,
+        feed: state.feed?.copyWith(followerCount: updatedCount),
+      );
     }
 
     // If the follow doesn't match any known categories,
@@ -372,6 +380,17 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
   }
 
   FeedState _removeFollow(FollowData follow, FeedState state) {
+    var feed = state.feed;
+
+    if (follow.isFollowerOf(state.fid)) {
+      final followerCount = follow.targetFeed.followerCount;
+      feed = feed?.copyWith(followerCount: followerCount);
+    }
+    if (follow.isFollowingFeed(state.fid)) {
+      final followingCount = follow.sourceFeed.followingCount;
+      feed = feed?.copyWith(followingCount: followingCount);
+    }
+
     final updatedFollowing = state.following.where((it) {
       return it.id != follow.id;
     }).toList();
@@ -385,6 +404,7 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     }).toList();
 
     return state.copyWith(
+      feed: feed,
       following: updatedFollowing,
       followers: updatedFollowers,
       followRequests: updatedFollowRequests,
diff --git a/sample_app/lib/screens/user_feed/profile/profile_section.dart b/sample_app/lib/screens/user_feed/profile/profile_section.dart
@@ -9,12 +9,14 @@ class ProfileSection<T> extends StatelessWidget {
     required this.items,
     required this.emptyMessage,
     required this.itemBuilder,
+    this.count,
   });
 
   final String title;
   final List<T> items;
   final String emptyMessage;
   final Widget Function(T item) itemBuilder;
+  final int? count;
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +26,7 @@ class ProfileSection<T> extends StatelessWidget {
       children: [
         _SectionHeader(
           title: title,
-          count: items.length,
+          count: count ?? items.length,
         ),
         DecoratedBox(
           decoration: BoxDecoration(
diff --git a/sample_app/lib/screens/user_feed/profile/user_profile.dart b/sample_app/lib/screens/user_feed/profile/user_profile.dart
@@ -1,3 +1,5 @@
+import 'dart:math' as math;
+
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_state_notifier/flutter_state_notifier.dart';
@@ -66,109 +68,172 @@ class _UserProfileState extends State<UserProfile> {
   Widget build(BuildContext context) {
     return StateNotifierBuilder(
       stateNotifier: widget.timelineFeed.notifier,
-      builder: (context, state, child) {
-        final feedMembers = state.members;
-        final followRequests = state.followRequests;
-        final following = state.following;
-        final currentUser = client.user;
-
-        final followIncludesCurrentUser =
-            following.any((it) => it.targetFeed.id == currentUser.id) ||
-                (followSuggestions?.any((it) => it.fid.id == currentUser.id) ??
-                    false);
-
-        return SingleChildScrollView(
-          controller: widget.scrollController,
-          padding: const EdgeInsets.all(20),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            spacing: 24,
-            children: [
-              // Profile Header Section
-              ProfileHeader(
-                user: currentUser,
-                membersCount: state.feed?.memberCount ?? 0,
-                followingCount: state.feed?.followingCount ?? 0,
-                followersCount: state.feed?.followerCount ?? 0,
+      builder: (context, timelineState, child) {
+        return StateNotifierBuilder(
+          stateNotifier: widget.userFeed.notifier,
+          builder: (context, userState, child) {
+            return _UserProfileContent(
+              client: client,
+              timelineState: timelineState,
+              userState: userState,
+              followSuggestions: followSuggestions,
+              scrollController: widget.scrollController,
+              onAcceptFollow: (fid) => widget.userFeed.acceptFollow(
+                sourceFid: fid,
               ),
-
-              // Members Section
-              ProfileSection<FeedMemberData>(
-                title: 'Members',
-                items: feedMembers,
-                emptyMessage: 'No members yet',
-                itemBuilder: (member) => MemberListItem(member: member),
+              onRejectFollow: (fid) => widget.userFeed.rejectFollow(
+                sourceFid: fid,
               ),
-
-              // Follow Requests Section
-              ProfileSection<FollowData>(
-                title: 'Follow Requests',
-                items: followRequests,
-                emptyMessage: 'No pending requests',
-                itemBuilder: (followRequest) => FollowRequestListItem(
-                  followRequest: followRequest,
-                  onAcceptPressed: () => widget.timelineFeed.acceptFollow(
-                    sourceFid: followRequest.sourceFeed.fid,
-                  ),
-                  onRejectPressed: () => widget.timelineFeed.rejectFollow(
-                    sourceFid: followRequest.sourceFeed.fid,
+              onFollow: (targetFeed) async {
+                final result = await widget.timelineFeed.follow(
+                  targetFid: targetFeed.fid,
+                  createNotificationActivity: true,
+                );
+
+                // Remove the followed user from suggestions
+                result.onSuccess(
+                  (_) => _updateFollowSuggestions([
+                    ...?followSuggestions?.where((it) => it != targetFeed),
+                  ]),
+                );
+              },
+              onUnfollow: (targetFeed) async {
+                final result = await widget.timelineFeed.unfollow(
+                  targetFid: targetFeed.fid,
+                );
+
+                // Add the unfollowed user back to suggestions
+                result.onSuccess(
+                  (_) => _updateFollowSuggestions(
+                    [...?followSuggestions, targetFeed],
                   ),
-                ),
-              ),
+                );
+              },
+            );
+          },
+        );
+      },
+    );
+  }
+}
 
-              // Following Section
-              ProfileSection<FollowData>(
-                title: 'Following',
-                items: following,
-                emptyMessage: 'Not following anyone yet',
-                itemBuilder: (follow) => FollowingListItem(
-                  follow: follow,
-                  onUnfollowPressed: () async {
-                    final result = await widget.timelineFeed.unfollow(
-                      targetFid: follow.targetFeed.fid,
-                    );
-
-                    // Add the unfollowed user back to suggestions
-                    result.onSuccess(
-                      (_) => _updateFollowSuggestions(
-                        [...?followSuggestions, follow.targetFeed],
-                      ),
-                    );
-                  },
-                ),
-              ),
+class _UserProfileContent extends StatelessWidget {
+  const _UserProfileContent({
+    required this.client,
+    required this.timelineState,
+    required this.userState,
+    required this.followSuggestions,
+    required this.scrollController,
+    required this.onAcceptFollow,
+    required this.onRejectFollow,
+    required this.onFollow,
+    required this.onUnfollow,
+  });
 
-              // Follow Suggestions Section
-              ProfileSection<FeedData>(
-                title: 'Suggested',
-                items: [
-                  if (!followIncludesCurrentUser &&
-                      widget.userFeed.state.feed != null)
-                    widget.userFeed.state.feed!,
-                  ...(followSuggestions ?? []),
-                ],
-                emptyMessage: 'No suggestions available',
-                itemBuilder: (suggestion) => SuggestionListItem(
-                  suggestion: suggestion,
-                  onFollowPressed: () async {
-                    final result = await widget.timelineFeed.follow(
-                      targetFid: suggestion.fid,
-                      createNotificationActivity: true,
-                    );
-
-                    // Remove the followed user from suggestions
-                    result.onSuccess(
-                      (_) => _updateFollowSuggestions([
-                        ...?followSuggestions?.where((it) => it != suggestion),
-                      ]),
-                    );
-                  },
-                ),
-              ),
+  final StreamFeedsClient client;
+  final FeedState timelineState;
+  final FeedState userState;
+  final List<FeedData>? followSuggestions;
+  final ScrollController? scrollController;
+
+  final ValueSetter<FeedId> onAcceptFollow;
+  final ValueSetter<FeedId> onRejectFollow;
+  final ValueSetter<FeedData> onFollow;
+  final ValueSetter<FeedData> onUnfollow;
+
+  @override
+  Widget build(BuildContext context) {
+    final currentUser = client.user;
+    final feedMembers = timelineState.members;
+
+    // We always follow ourselves, so we don't need to show it in the following list
+    final following = timelineState.following
+        .where((it) => it.targetFeed.id != currentUser.id)
+        .toList();
+    final followingCount = math.max(
+      0,
+      (timelineState.feed?.followingCount ?? 0) - 1,
+    );
+    final followersCount = math.max(
+      0,
+      (userState.feed?.followerCount ?? 0) - 1,
+    );
+
+    final followRequests = userState.followRequests;
+
+    final followIncludesCurrentUser = following
+            .any((it) => it.targetFeed.id == currentUser.id) ||
+        (followSuggestions?.any((it) => it.fid.id == currentUser.id) ?? false);
+
+    return SingleChildScrollView(
+      controller: scrollController,
+      padding: const EdgeInsets.all(20),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 24,
+        children: [
+          // Profile Header Section
+          ProfileHeader(
+            user: currentUser,
+            membersCount: timelineState.feed?.memberCount ?? 0,
+            followingCount: followingCount,
+            followersCount: followersCount,
+          ),
+
+          // Members Section
+          ProfileSection<FeedMemberData>(
+            title: 'Members',
+            items: feedMembers,
+            emptyMessage: 'No members yet',
+            itemBuilder: (member) => MemberListItem(member: member),
+          ),
+
+          // Follow Requests Section
+          ProfileSection<FollowData>(
+            title: 'Follow Requests',
+            items: followRequests,
+            emptyMessage: 'No pending requests',
+            itemBuilder: (followRequest) => FollowRequestListItem(
+              followRequest: followRequest,
+              onAcceptPressed: () =>
+                  onAcceptFollow(followRequest.sourceFeed.fid),
+              onRejectPressed: () =>
+                  onRejectFollow(followRequest.sourceFeed.fid),
+            ),
+          ),
+
+          // Following Section
+          ProfileSection<FollowData>(
+            title: 'Following',
+            count: followingCount,
+            items: following,
+            emptyMessage: 'Not following anyone yet',
+            itemBuilder: (follow) => FollowingListItem(
+              follow: follow,
+              onUnfollowPressed: () {
+                onUnfollow(follow.targetFeed);
+              },
+            ),
+          ),
+
+          // Follow Suggestions Section
+          ProfileSection<FeedData>(
+            title: 'Suggested',
+            items: [
+              if (!followIncludesCurrentUser && userState.feed != null)
+                userState.feed!,
+              ...(followSuggestions ?? []),
             ],
+            emptyMessage: 'No suggestions available',
+            itemBuilder: (suggestion) => SuggestionListItem(
+              suggestion: suggestion,
+              onFollowPressed: () {
+                onFollow(suggestion);
+              },
+            ),
           ),
-        );
-      },
+        ],
+      ),
     );
   }
 }
diff --git a/sample_app/lib/screens/user_feed/user_feed_screen.dart b/sample_app/lib/screens/user_feed/user_feed_screen.dart
