minor refactor

Author: tensor-programming

lib/blocs/contribution_bloc.dart

@@ -17,7 +17,8 @@ class ContributionBloc {
   Stream<int> _timer = Stream.empty();
   // BehaviorSubject allows seeding the tabIndex data to pending.
   // Tagname is the name of the tab and modifier for the contributions
-  BehaviorSubject<int> _tabIndex = BehaviorSubject<int>(seedValue: 0);
+  BehaviorSubject<String> _tabName =
+      BehaviorSubject<String>(seedValue: 'unreviewed');
   // Stream<String> _log = Stream.empty();
 
   BehaviorSubject<String> _filter = BehaviorSubject<String>(seedValue: 'all');
@@ -27,11 +28,11 @@ class ContributionBloc {
   Stream<String> get voteCount => _voteCount;
   Stream<int> get timer => _timer;
 
-  Sink<int> get tabIndex => _tabIndex;
+  Sink<String> get tabName => _tabName;
   Sink<String> get filter => _filter;
 
   ContributionBloc(this.api, this.parseWebsite) {
-    _results = _tabIndex
+    _results = _tabName
 
         // Apply the api updateContributions function to tabIndex stream to get results.
         .asyncMap(api.updateContributions)
@@ -50,7 +51,7 @@ class ContributionBloc {
   }
 
   void dispose() {
-    _tabIndex.close();
+    _tabName.close();
     _filter.close();
   }
 }

lib/components/list_page.dart

@@ -9,7 +9,7 @@ import 'package:utopian_rocks/blocs/contribution_bloc.dart';
 class ListPage extends StatelessWidget {
   final ContributionBloc bloc;
   final String tabName;
-  final Function(int, ContributionBloc) callback;
+  final Function(String, ContributionBloc) callback;
 
   ListPage(this.tabName, this.bloc, this.callback);
   // Pass in the [tabName] or string which represents the page name.
@@ -19,8 +19,8 @@ class ListPage extends StatelessWidget {
   Widget build(BuildContext context) {
     // get block from [ContributionProvider] to add to [StreamBuilder]
     final parseWebsite = ParseWebsite();
-    final tab = DefaultTabController.of(context);
-    callback(tab.index, bloc);
+
+    callback(tabName, bloc);
 
     parseWebsite.getHtml();
 

lib/main.dart

@@ -169,7 +169,7 @@ class RootApp extends StatelessWidget {
     );
   }
 
-  void initialize(int tabIndex, ContributionBloc bloc) {
-    bloc.tabIndex.add(tabIndex);
+  void initialize(String tabName, ContributionBloc bloc) {
+    bloc.tabName.add(tabName);
   }
 }

lib/model/repository.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:utopian_rocks/model/model.dart';
-import 'package:utopian_rocks/utils/utils.dart';
 
 import 'package:http/http.dart' show Client;
 
@@ -12,12 +11,12 @@ class Api {
   static const String _url = 'https://utopian.rocks/api/posts?status={0}';
 
   // grab the contributions from the endpoint based on the tabname.
-  Future<List<Contribution>> updateContributions(int tabIndex) async {
+  Future<List<Contribution>> updateContributions(String tabName) async {
     List<Contribution> items = [];
     await _client
         // add the tabname to the url to change the API endpoint based on the page request
         // Decode the json and then serialize it into [Contribution] objects.
-        .get(Uri.parse(_url.replaceFirst("{0}", statuses[tabIndex])))
+        .get(Uri.parse(_url.replaceFirst("{0}", tabName ?? "unreviewed")))
         .then((res) => res.body)
         .then(json.decode)
         .then((json) => json.forEach(

lib/utils/utils.dart

@@ -87,10 +87,8 @@ List<Contribution> applyFilter(
   String filter,
   List<Contribution> contributions,
 ) {
-  var cons = contributions;
-
   if (filter != 'all') {
-    return cons.where((c) => c.category == filter).toList();
+    return contributions.where((c) => c.category == filter).toList();
   }
-  return cons;
+  return contributions;
 }