refactor(polls_container): improve _streamBuilder params definition

* add class generic types
albertms10 · Jan 9, 2021 · 476cf3a · 476cf3a
1 parent 2ece435
commit 476cf3a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/lib/pages/feed_content.dart b/lib/pages/feed_content.dart
@@ -3,10 +3,10 @@ import 'package:stay_home_polls_app/model/poll.dart';
 import 'package:stay_home_polls_app/pages/page_content.dart';
 import 'package:stay_home_polls_app/widgets/polls_container.dart';
 
-class FeedContent extends StatelessWidget {
+class FeedContent<T extends Poll> extends StatelessWidget {
   const FeedContent();
 
-  List<Poll> _filterCallback(List<Poll> pollsList, List<Poll> userPollsList) {
+  List<T> _filterCallback(List<T> pollsList, List<T> userPollsList) {
     return pollsList.where((poll) {
       final userPoll = userPollsList.firstWhere(
         (userPoll) => userPoll != null ? poll.id == userPoll.id : false,
@@ -33,11 +33,11 @@ class FeedContent extends StatelessWidget {
       ],
       emptyMessage: 'You ran out of polls',
       children: [
-        PollsContainer(
+        PollsContainer<T>(
           streamPollsList: popularPollListSnapshots(),
           filterCallback: _filterCallback,
         ),
-        PollsContainer(
+        PollsContainer<T>(
           streamPollsList: latestPollListSnapshots(),
           filterCallback: _filterCallback,
         ),

diff --git a/lib/pages/user_content.dart b/lib/pages/user_content.dart
@@ -3,13 +3,13 @@ import 'package:stay_home_polls_app/model/poll.dart';
 import 'package:stay_home_polls_app/pages/page_content.dart';
 import 'package:stay_home_polls_app/widgets/polls_container.dart';
 
-class UserContent extends StatelessWidget {
+class UserContent<T extends Poll> extends StatelessWidget {
   const UserContent();
 
-  List<Poll> _filterCallback(
-    List<Poll> pollsList,
-    List<Poll> userPollsList,
-    bool Function(Poll, Poll) check,
+  List<T> _filterCallback(
+    List<T> pollsList,
+    List<T> userPollsList,
+    bool Function(T, T) check,
   ) {
     return pollsList.where((poll) {
       final userPoll = userPollsList.firstWhere(
@@ -35,15 +35,15 @@ class UserContent extends StatelessWidget {
       ],
       emptyMessage: 'No polls yet',
       children: [
-        PollsContainer(
+        PollsContainer<T>(
           streamPollsList: popularPollListSnapshots(),
           filterCallback: (pollsList, userPollsList) => _filterCallback(
             pollsList,
             userPollsList,
             (poll, userPoll) => poll.id == userPoll.id && userPoll.isAuth,
           ),
         ),
-        PollsContainer(
+        PollsContainer<T>(
           streamPollsList: popularPollListSnapshots(),
           filterCallback: (pollsList, userPollsList) => _filterCallback(
             pollsList,

diff --git a/lib/widgets/polls_container.dart b/lib/widgets/polls_container.dart
@@ -4,16 +4,16 @@ import 'package:stay_home_polls_app/model/poll.dart';
 import 'package:stay_home_polls_app/model/user.dart';
 import 'package:stay_home_polls_app/widgets/polls_list.dart';
 
-class PollsContainer extends StatelessWidget {
-  final Stream<List<Poll>> streamPollsList;
-  final List<Poll> Function(List<Poll>, List<Poll>) filterCallback;
+class PollsContainer<T extends Poll> extends StatelessWidget {
+  final Stream<List<T>> streamPollsList;
+  final List<T> Function(List<T>, List<T>) filterCallback;
 
   const PollsContainer({this.streamPollsList, this.filterCallback});
 
-  StreamBuilder<List<Poll>> _streamBuilder(
-    stream,
-    Widget Function(List<Poll>) callback,
-  ) {
+  StreamBuilder<List<T>> _streamBuilder({
+    Stream<List<T>> stream,
+    Widget Function(BuildContext, List<T>) builder,
+  }) {
     return StreamBuilder(
       stream: stream,
       builder: (context, snapshot) {
@@ -26,7 +26,7 @@ class PollsContainer extends StatelessWidget {
             return const Center(child: CircularProgressIndicator());
 
           case ConnectionState.active:
-            return callback(snapshot.data);
+            return builder(context, snapshot.data);
 
           case ConnectionState.done:
             return const Center(child: Text('Connection done'));
@@ -43,13 +43,20 @@ class PollsContainer extends StatelessWidget {
   Widget build(BuildContext context) {
     final user = Provider.of<User>(context);
 
-    return _streamBuilder(streamPollsList, (polls) {
-      return _streamBuilder(user.pollsSnapshots(), (userPolls) {
-        return PollsList(
-          polls:
-              filterCallback != null ? filterCallback(polls, userPolls) : polls,
+    return _streamBuilder(
+      stream: streamPollsList,
+      builder: (context, polls) {
+        return _streamBuilder(
+          stream: user.pollsSnapshots(),
+          builder: (context, userPolls) {
+            return PollsList(
+              polls: filterCallback != null
+                  ? filterCallback(polls, userPolls)
+                  : polls,
+            );
+          },
         );
-      });
-    });
+      },
+    );
   }
 }