added filter

Author: tensor-programming

lib/blocs/contribution_bloc.dart

@@ -4,6 +4,8 @@ import 'package:utopian_rocks/model/repository.dart';
 import 'package:utopian_rocks/model/htmlParser.dart';
 import 'package:rxdart/rxdart.dart';
 
+import 'package:utopian_rocks/utils/utils.dart' as utils;
+
 // Contribution buisness logic class
 class ContributionBloc {
   final Api api;
@@ -19,19 +21,22 @@ class ContributionBloc {
       BehaviorSubject<String>(seedValue: 'pending');
   // Stream<String> _log = Stream.empty();
 
+  BehaviorSubject<String> _filter = BehaviorSubject<String>(seedValue: 'all');
+
   Stream<List<Contribution>> get results => _results;
-  Sink<String> get tabname => _tabname;
   Stream<String> get voteCount => _voteCount;
   Stream<int> get timer => _timer;
 
-  // Stream<String> get log => _log;
+  Sink<String> get tabname => _tabname;
+  Sink<String> get filter => _filter;
 
   ContributionBloc(this.api, this.parseWebsite) {
     _results = _tabname
         // Debounce to account for latency
         .debounce(Duration(milliseconds: 300))
         // Apply the api updateContributions function to tabname stream to get results.
         .asyncMap(api.updateContributions)
+        .asyncMap(applyFilter)
         .asBroadcastStream();
 
     _voteCount = Observable.fromFuture(
@@ -41,13 +46,25 @@ class ContributionBloc {
     _timer = Observable.periodic(Duration(seconds: 1), (x) => x)
         .asyncMap(parseWebsite.getTimer)
         .asBroadcastStream();
-
-    // _log = Observable(results)
-    //     .withLatestFrom(_tabname.stream, (_, tabname) => 'results for $tabname')
-    //     .asBroadcastStream();
   }
 
   void dispose() {
     _tabname.close();
+    _filter.close();
+  }
+
+  Future<List<Contribution>> applyFilter(
+      List<Contribution> contributions) async {
+    var filter = await _filter.stream.first ?? 'all';
+    var tabname = await _tabname.stream.first;
+
+    var cons = contributions;
+
+    _tabname.add(tabname);
+    if (filter != 'all') {
+      cons.removeWhere((c) => c.category != filter);
+      return cons;
+    }
+    return cons;
   }
 }

lib/blocs/information_bloc.dart

@@ -18,13 +18,11 @@ class InformationBloc {
   Stream<GithubReleaseModel> get releases => _releases;
 
   // BLoc that serves package information to the information drawer.
+  // Bloc gets Github release information only on application start.
   InformationBloc(this.packageInfo, this.api) {
     _infoStream = Observable.fromFuture(packageInfo).asBroadcastStream();
-
-    api.getReleases();
-
-    _releases = Observable.fromFuture(api.getReleases())
-        .debounce(Duration(minutes: 5))
-        .asBroadcastStream();
+    // release information is served as a normal stream which can only be subscribed to once.
+    // This stream also only has one element in it. This is done to stop from overflowing the Github API.
+    _releases = Observable.fromFuture(api.getReleases()).take(1);
   }
 }

lib/main.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:package_info/package_info.dart';
 import 'package:intl/intl.dart';
 
+import 'package:rxdart/rxdart.dart';
+
 import 'package:utopian_rocks/components/list_page.dart';
 import 'package:utopian_rocks/components/drawer.dart';
 
@@ -14,6 +16,7 @@ import 'package:utopian_rocks/blocs/information_bloc.dart';
 import 'package:utopian_rocks/providers/information_provider.dart';
 import 'package:utopian_rocks/model/htmlParser.dart';
 import 'package:utopian_rocks/model/githubApi.dart';
+import 'package:utopian_rocks/utils/utils.dart';
 
 void main() => runApp(MyApp());
 
@@ -43,6 +46,7 @@ class RootApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final informationBloc = InformationProvider.of(context);
+    final contributionBloc = ContributionProvider.of(context);
     return MaterialApp(
       // Remove Debug flag to allow app to be production ready.
       debugShowCheckedModeBanner: false,
@@ -78,6 +82,7 @@ class RootApp extends StatelessWidget {
                       ),
                     ],
                   ),
+
                   // Add [TabBar] to the [AppBar] to allow the user to navigate from one page to the next.
                   bottom: TabBar(
                     tabs: <Widget>[
@@ -98,39 +103,67 @@ class RootApp extends StatelessWidget {
                     ListPage('pending'),
                   ],
                 ),
-                bottomNavigationBar: _buildBottonSheet(context),
+                bottomNavigationBar:
+                    _buildBottonSheet(context, contributionBloc),
                 endDrawer: InformationDrawer(snapshot),
               ),
         ),
       ),
     );
   }
 
-  Widget _buildBottonSheet(BuildContext context) {
-    final contributionBloc = ContributionProvider.of(context);
-
+  Widget _buildBottonSheet(
+    BuildContext context,
+    ContributionBloc contributionBloc,
+  ) {
     return StreamBuilder(
         stream: contributionBloc.voteCount,
         builder: (context, votecountSnapshot) => BottomAppBar(
-              color: Color(0xff26A69A),
-              child: Row(
-                children: [
-                  StreamBuilder(
-                      stream: contributionBloc.timer,
-                      builder: (context, timerSnapshot) {
-                        return Text(
-                          'Next Vote Cycle: ${DateFormat.Hms().format(DateTime(0, 0, 0, 0, 0, timerSnapshot.data ?? 0))} ',
-                          style: TextStyle(fontWeight: FontWeight.w700),
-                        );
-                      }),
-                  Text(
-                    'Vote Power: ${double.parse(votecountSnapshot.data ?? '0.0').toStringAsPrecision(4)}',
-                    style: TextStyle(fontWeight: FontWeight.w700),
+            color: Color(0xff26A69A),
+            child: Row(
+              children: [
+                StreamBuilder(
+                    stream: contributionBloc.timer,
+                    builder: (context, timerSnapshot) {
+                      return Text(
+                        'Next Vote Cycle: ${DateFormat.Hms().format(DateTime(0, 0, 0, 0, 0, timerSnapshot.data ?? 0))} ',
+                        style: TextStyle(fontWeight: FontWeight.w700),
+                      );
+                    }),
+                Text(
+                  'Vote Power: ${double.parse(votecountSnapshot.data ?? '0.0').toStringAsPrecision(4)}',
+                  style: TextStyle(fontWeight: FontWeight.w700),
+                ),
+                _generateMenu(categories, contributionBloc),
+              ],
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              crossAxisAlignment: CrossAxisAlignment.center,
+            )));
+  }
+
+  Widget _generateMenu(
+    List<String> categories,
+    ContributionBloc bloc,
+  ) {
+    return PopupMenuButton<String>(
+      tooltip: 'Filter Contribution Categories',
+      onSelected: (category) => bloc.filter.add(category),
+      itemBuilder: (context) => categories
+          .map((cate) => PopupMenuItem(
+                height: 40.0,
+                value: cate,
+                child: ListTile(
+                  leading: Icon(
+                    IconData(
+                      icons[cate],
+                      fontFamily: 'Utopicons',
+                    ),
+                    color: colors[cate],
                   ),
-                ],
-                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                crossAxisAlignment: CrossAxisAlignment.center,
-              ),
-            ));
+                  title: Text(cate),
+                ),
+              ))
+          .toList(),
+    );
   }
 }

lib/model/githubApi.dart

@@ -11,11 +11,10 @@ class GithubApi {
       'https://api.github.com/repos/tensor-programming/utopian-rocks-mobile/releases';
 
   Future<GithubReleaseModel> getReleases() async {
-    List<GithubReleaseModel> items = [];
-
-    Response res = await _client.get(Uri.parse(_url));
-    List map = json.decode(res.body);
-    var x = map.map((gh) => GithubReleaseModel.fromJson(gh)).toList();
+    String resBody =
+        await _client.get(Uri.parse(_url)).then((Response res) => res.body);
+    List ghJson = json.decode(resBody);
+    var x = ghJson.map((gh) => GithubReleaseModel.fromJson(gh)).toList();
     return x.first;
   }
 }

lib/model/model.dart

@@ -28,7 +28,9 @@ class Contribution {
   Contribution.fromJson(Map json)
       : author = json['author'] as String,
         // Remove any -task categories
-        category = (json['category'] as String).replaceFirst('-task', ''),
+        category = (json['category'] as String)
+            .replaceFirst('-task', '')
+            .replaceFirst("task-", ''),
         moderator = json['moderator'] as String,
         // Shorten Repository url for UI page.
         repository = (json['repository'] as String)

lib/utils/utils.dart

@@ -1,5 +1,21 @@
 import 'package:flutter/material.dart';
 
+const categories = [
+  'ideas',
+  'development',
+  'bug-hunting',
+  'translations',
+  'graphics',
+  'analysis',
+  'documentation',
+  'tutorials',
+  'video-tutorials',
+  'copywriting',
+  'blog',
+  'social',
+  'all',
+];
+
 // a list of the Utopian Color hexidecimal codes.
 const colors = <String, Color>{
   'ideas': Color(0xFF4DD39F),
@@ -14,6 +30,7 @@ const colors = <String, Color>{
   'copywriting': Color(0xFF007f80),
   'blog': Color(0xff0275d8),
   'social': Color(0xff7bc0f5),
+  'all': Color(0xff3237c9),
 };
 
 // A list of the Utopian Icon font codes.
@@ -30,6 +47,7 @@ const icons = <String, int>{
   'copywriting': 0x0044,
   'blog': 0x0042,
   'social': 0x004c,
+  'all': 0x004e
 };
 
 // Vote wieghts for Utopian vote based on Category