refactor: extract link tap screen builder

lib/screens/notifications.dart

@@ -61,48 +61,51 @@ class NotificationScreenState extends State<NotificationScreen> {
       _groupMap[repo].items.add(item);
     });
 
-    var schema = '{';
+    if (_groupMap.isNotEmpty) {
-    _groupMap.forEach((repo, group) {
+      // query state of issues and pull requests
-      var repoKey = getRepoKey(group);
+      var schema = '{';
-      schema +=
+      _groupMap.forEach((repo, group) {
-          '$repoKey: repository(owner: "${group.owner}", name: "${group.name}") {';
+        var repoKey = getRepoKey(group);
+        schema +=
+            '$repoKey: repository(owner: "${group.owner}", name: "${group.name}") {';
 
-      group.items.forEach((item) {
+        group.items.forEach((item) {
-        var key = getItemKey(item);
+          var key = getItemKey(item);
 
-        switch (item.type) {
+          switch (item.type) {
-          case 'Issue':
+            case 'Issue':
-            schema += '''
+              schema += '''
 $key: issue(number: ${item.number}) {
   state
 }
 ''';
-            break;
+              break;
-          case 'PullRequest':
+            case 'PullRequest':
-            schema += '''
+              schema += '''
 $key: pullRequest(number: ${item.number}) {
   state
 }
 ''';
-            break;
+              break;
-        }
+          }
-      });
+        });
 
+        schema += '}';
+      });
       schema += '}';
-    });
-    schema += '}';
 
-    // print(schema);
+      // print(schema);
-    var data = await SettingsProvider.of(context).query(schema);
+      var data = await SettingsProvider.of(context).query(schema);
-    _groupMap.forEach((repo, group) {
+      _groupMap.forEach((repo, group) {
-      group.items.forEach((item) {
+        group.items.forEach((item) {
-        var itemData = data[getRepoKey(group)][getItemKey(item)];
+          var itemData = data[getRepoKey(group)][getItemKey(item)];
-        if (itemData != null) {
+          if (itemData != null) {
-          item.state = itemData['state'];
+            item.state = itemData['state'];
-        }
+          }
+        });
       });
-    });
+      // print(data);
-    // print(data);
+    }
 
     return _groupMap;
   }
@@ -120,10 +123,10 @@ $key: pullRequest(number: ${item.number}) {
               style: TextStyle(color: Colors.black, fontSize: 15),
             ),
             Link(
-              onTap: () async {
+              beforeRedirect: () async {
-                // await SettingsProvider.of(context)
+                await SettingsProvider.of(context)
-                //     .putWithCredentials('/repos/$repo/notifications');
+                    .putWithCredentials('/repos/$repo/notifications');
-                // await _refresh();
+                await _refresh();
               },
               child: Icon(
                 Octicons.check,

lib/screens/repo.dart

@@ -113,16 +113,12 @@ class _RepoScreenState extends State<RepoScreen> {
                   EntryItem(
                     count: payload['issues']['totalCount'],
                     text: 'Issues',
-                    route: CupertinoPageRoute(
+                    screenBuilder: (context) => IssuesScreen(),
-                      builder: (context) => IssuesScreen(),
-                    ),
                   ),
                   EntryItem(
                     count: payload['pullRequests']['totalCount'],
                     text: 'Pull Requests',
-                    route: CupertinoPageRoute(
+                    screenBuilder: (context) => PullRequestsScreen(),
-                      builder: (context) => PullRequestsScreen(),
-                    ),
                   ),
                 ],
               ),

lib/screens/user.dart

@@ -175,26 +175,22 @@ class _UserScreenState extends State<UserScreen> {
                   EntryItem(
                     count: payload['repositories']['totalCount'],
                     text: 'Repositories',
-                    route:
+                    screenBuilder: (context) => ReposScreen(),
-                        CupertinoPageRoute(builder: (context) => ReposScreen()),
                   ),
                   EntryItem(
                     count: payload['starredRepositories']['totalCount'],
                     text: 'Stars',
-                    route:
+                    screenBuilder: (context) => ReposScreen(),
-                        CupertinoPageRoute(builder: (context) => ReposScreen()),
                   ),
                   EntryItem(
                     count: payload['followers']['totalCount'],
                     text: 'Followers',
-                    route:
+                    screenBuilder: (context) => UsersScreen(),
-                        CupertinoPageRoute(builder: (context) => UsersScreen()),
                   ),
                   EntryItem(
                     count: payload['following']['totalCount'],
                     text: 'Following',
-                    route:
+                    screenBuilder: (context) => UsersScreen(),
-                        CupertinoPageRoute(builder: (context) => UsersScreen()),
                   ),
                 ],
               ),

lib/widgets/avatar.dart

@@ -17,10 +17,7 @@ class Avatar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Link(
-      onTap: () {
+      screenBuilder: (_) => UserScreen(login),
-        Navigator.of(context)
-            .push(CupertinoPageRoute(builder: (_) => UserScreen(login)));
-      },
       child: CircleAvatar(
         backgroundColor: Colors.transparent,
         backgroundImage: NetworkImage(url),

lib/widgets/entry_item.dart

@@ -4,9 +4,9 @@ import 'link.dart';
 class EntryItem extends StatelessWidget {
   final int count;
   final String text;
-  final CupertinoPageRoute route;
+  final WidgetBuilder screenBuilder;
 
-  EntryItem({this.count, this.text, this.route});
+  EntryItem({this.count, this.text, this.screenBuilder});
 
   @override
   Widget build(BuildContext context) {
@@ -17,14 +17,12 @@ class EntryItem extends StatelessWidget {
           padding: EdgeInsets.symmetric(vertical: 10),
           child: Column(
             children: <Widget>[
-              Text(count.toString()),
+              Text(count.toString(), style: TextStyle(fontSize: 18)),
               Text(text, style: TextStyle(fontSize: 13))
             ],
           ),
         ),
-        onTap: () {
+        screenBuilder: screenBuilder,
-          Navigator.of(context).push(route);
-        },
       ),
     );
   }

lib/widgets/event_item.dart

@@ -3,8 +3,9 @@ import 'package:flutter/cupertino.dart';
 import '../screens/issue.dart';
 import '../screens/pull_request.dart';
 import '../screens/user.dart';
-import '../utils/utils.dart';
+import 'link.dart';
 import 'avatar.dart';
+import '../utils/utils.dart';
 
 class EventItem extends StatelessWidget {
   final Event event;
@@ -39,10 +40,7 @@ class EventItem extends StatelessWidget {
   }) {
     var _spans = [
       createLinkSpan(
-        context,
+          context, event.actor.login, () => UserScreen(event.actor.login))
-        event.actor.login,
-        () => UserScreen(event.actor.login),
-      )
     ];
     _spans.addAll(spans);
 

lib/widgets/link.dart

@@ -1,24 +1,46 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import '../providers/settings.dart';
 
 class Link extends StatelessWidget {
   final Widget child;
-  final GestureTapCallback onTap;
+  final WidgetBuilder screenBuilder;
+  final Function beforeRedirect;
   final Color bgColor;
 
-  Link({@required this.child, @required this.onTap, this.bgColor});
+  Link({
+    @required this.child,
+    this.screenBuilder,
+    this.beforeRedirect,
+    this.bgColor,
+  });
 
   @override
   Widget build(BuildContext context) {
+    var theme = SettingsProvider.of(context).theme;
     return Material(
       child: Ink(
         color: bgColor ?? Colors.white,
         child: InkWell(
-          splashColor: SettingsProvider.of(context).theme == ThemeMap.cupertino
-              ? Colors.transparent
-              : null,
-          onTap: onTap,
           child: child,
+          splashColor: theme == ThemeMap.cupertino ? Colors.transparent : null,
+          onTap: () {
+            if (beforeRedirect != null) {
+              beforeRedirect();
+            }
+
+            if (screenBuilder != null) {
+              switch (theme) {
+                case ThemeMap.cupertino:
+                  Navigator.of(context)
+                      .push(CupertinoPageRoute(builder: screenBuilder));
+                  break;
+                default:
+                  Navigator.of(context)
+                      .push(MaterialPageRoute(builder: screenBuilder));
+              }
+            }
+          },
         ),
       ),
     );

lib/widgets/list_scaffold.dart

@@ -139,15 +139,15 @@ class _ListScaffoldState extends State<ListScaffold> {
         return CupertinoPageScaffold(
           navigationBar: CupertinoNavigationBar(
             middle: widget.title,
-            trailing: Link(
+            // trailing: Link(
-              child: Icon(
+            //   child: Icon(
-                widget.trailingIconData,
+            //     widget.trailingIconData,
-                size: 24,
+            //     size: 24,
-                color: Colors.blueAccent,
+            //     color: Colors.blueAccent,
-              ),
+            //   ),
-              onTap: widget.trailingOnTap,
+            //   beforeRedirect: widget.trailingOnTap,
-              bgColor: Colors.transparent,
+            //   bgColor: Colors.transparent,
-            ),
+            // ),
           ),
           child: SafeArea(
             child: CustomScrollView(

lib/widgets/notification_item.dart

@@ -52,7 +52,7 @@ class _NotificationItemState extends State<NotificationItem> {
   NotificationPayload get payload => widget.payload;
   bool loading = false;
 
-  Widget _buildRoute() {
+  Widget _buildRoute(BuildContext context) {
     switch (payload.type) {
       case 'Issue':
         return IssueScreen(payload.number, payload.owner, payload.name);
@@ -132,12 +132,8 @@ class _NotificationItemState extends State<NotificationItem> {
   @override
   Widget build(BuildContext context) {
     return Link(
-      onTap: () {
+      screenBuilder: _buildRoute,
-        _markAsRead();
+      beforeRedirect: _markAsRead,
-        Navigator.of(context).push(
-          CupertinoPageRoute(builder: (context) => _buildRoute()),
-        );
-      },
       child: Opacity(
         opacity: payload.unread ? 1 : 0.5,
         child: Container(
@@ -154,10 +150,7 @@ class _NotificationItemState extends State<NotificationItem> {
                   overflow: TextOverflow.ellipsis,
                 ),
               ),
-              Link(
+              Link(child: _buildCheckIcon(), beforeRedirect: _markAsRead),
-                child: _buildCheckIcon(),
-                onTap: _markAsRead,
-              ),
             ],
           ),
         ),

lib/widgets/repo_item.dart

@@ -22,14 +22,7 @@ class RepoItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Link(
-      onTap: () {
+      screenBuilder: (_) => RepoScreen(item['owner']['login'], item['name']),
-        Navigator.of(context).push(
-          CupertinoPageRoute(
-            builder: (context) =>
-                RepoScreen(item['owner']['login'], item['name']),
-          ),
-        );
-      },
       child: Padding(
         padding: EdgeInsets.all(10),
         child: Row(

lib/widgets/user_name.dart

@@ -17,11 +17,7 @@ class UserName extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Link(
-      onTap: () {
+      screenBuilder: (_) => UserScreen(login),
-        Navigator.of(context).push(
-          CupertinoPageRoute(builder: (_) => UserScreen(login)),
-        );
-      },
       child: Container(
         padding: EdgeInsets.all(2),
         decoration: BoxDecoration(