feat: notification page style

lib/ios/notification.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
-import '../models/notification.dart';
-import '../providers/notification.dart';
-import 'package:git_flux/screens/repo.dart';
+import 'package:git_flux/models/notification.dart';
+import 'package:git_flux/providers/notification.dart';
+import 'package:git_flux/screens/issue.dart';
+import 'package:git_flux/octicons.dart';
 
 class NotificationScreen extends StatefulWidget {
   @override
@@ -15,51 +16,98 @@ class NotificationScreenState extends State<NotificationScreen> {
     // initFetch();
   }
 
+  Widget _getRouteWidget(String type) {
+    switch (type) {
+      case 'Issue':
+      case 'PullRequest':
+        return IssueScreen();
+      default:
+        throw new Exception('Unhandled notification type: $type');
+    }
+  }
+
+  IconData _buildIconData(String type) {
+    switch (type) {
+      case 'Issue':
+        return Octicons.issue_opened;
+      // color: Color.fromRGBO(0x28, 0xa7, 0x45, 1),
+      case 'PullRequest':
+        return Octicons.git_pull_request;
+      // color: Color.fromRGBO(0x6f, 0x42, 0xc1, 1),
+      default:
+        throw new Exception('Unhandled icon type: $type');
+    }
+  }
+
   Widget _buildItem(BuildContext context, NotificationItem item) {
-    return GestureDetector(
-      onTap: () {
-        Navigator.of(context).push(CupertinoPageRoute(
-            title: 'test', builder: (context) => RepoScreen()));
-      },
-      child: Container(
-        child: Row(
-          children: <Widget>[
-            Icon(Icons.info_outline),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Text(item.subject.title),
-                  Text(item.updatedAt)
-                ],
+    return Material(
+      child: InkWell(
+        splashColor: Colors.transparent,
+        onTap: () {
+          Navigator.of(context).push(
+            CupertinoPageRoute(
+                builder: (context) => _getRouteWidget(item.subject.type)),
+          );
+        },
+        child: Container(
+          child: Row(
+            children: <Widget>[
+              Container(
+                padding: EdgeInsets.symmetric(horizontal: 8),
+                child: Icon(_buildIconData(item.subject.type),
+                    color: CupertinoColors.inactiveGray),
               ),
-            ),
-            Icon(Icons.arrow_forward_ios)
-          ],
+              Expanded(
+                child: Container(
+                  padding: EdgeInsets.symmetric(vertical: 8),
+                  decoration: BoxDecoration(
+                      border: Border(bottom: BorderSide(color: Colors.grey))),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      Text(item.subject.title, style: TextStyle(height: 1)),
+                      Container(
+                        padding: EdgeInsets.only(top: 4),
+                        child: Text(
+                          item.updatedAt,
+                          style: TextStyle(fontSize: 12),
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+              ),
+              Container(
+                padding: EdgeInsets.symmetric(horizontal: 8),
+                child: Icon(
+                  CupertinoIcons.right_chevron,
+                  color: CupertinoColors.inactiveGray,
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );
   }
 
-  Widget _buildGroupItem(NotificationGroup group) {
+  Widget _buildGroupItem(BuildContext context, NotificationGroup group) {
     return Container(
-      padding: EdgeInsets.all(10),
+      // padding: EdgeInsets.all(10),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: <Widget>[
           Container(
+            padding: EdgeInsets.only(top: 10, left: 4, bottom: 4),
             color: CupertinoColors.extraLightBackgroundGray,
             child: Text(
               group.fullName,
               style: TextStyle(color: CupertinoColors.black),
             ),
           ),
-          ListView.builder(
-            shrinkWrap: true,
-            itemCount: group.items.length,
-            itemBuilder: (context, index) =>
-                _buildItem(context, group.items[index]),
-          ),
+          Column(
+              children:
+                  group.items.map((item) => _buildItem(context, item)).toList())
         ],
       ),
     );
@@ -114,11 +162,11 @@ class NotificationScreenState extends State<NotificationScreen> {
 
                           List<NotificationGroup> groups = snapshot.data;
 
-                          return ListView.builder(
-                            itemCount: groups.length,
-                            itemBuilder: (context, i) =>
-                                _buildGroupItem(groups[i]),
-                          );
+                          return ListView(
+                              children: groups
+                                  .map((group) =>
+                                      _buildGroupItem(context, group))
+                                  .toList());
                         },
                       ),
               );

lib/models/notification.dart

@@ -40,13 +40,12 @@ class Repository {
 
 @JsonSerializable()
 class NotificationItem {
-  NotificationItem(this.id, this.type, this.updatedAt, this.actor,
-      this.repository, this.subject);
+  NotificationItem(
+      this.id, this.type, this.updatedAt, this.repository, this.subject);
 
   String id;
   String type;
   String updatedAt;
-  Subject actor;
   Repository repository;
   Subject subject;
   Map<String, dynamic> payload;

lib/models/notification.g.dart

@@ -43,9 +43,6 @@ NotificationItem _$NotificationItemFromJson(Map<String, dynamic> json) {
       json['id'] as String,
       json['type'] as String,
       json['updated_at'] as String,
-      json['actor'] == null
-          ? null
-          : Subject.fromJson(json['actor'] as Map<String, dynamic>),
       json['repository'] == null
           ? null
           : Repository.fromJson(json['repository'] as Map<String, dynamic>),
@@ -60,7 +57,6 @@ Map<String, dynamic> _$NotificationItemToJson(NotificationItem instance) =>
       'id': instance.id,
       'type': instance.type,
       'updated_at': instance.updatedAt,
-      'actor': instance.actor,
       'repository': instance.repository,
       'subject': instance.subject,
       'payload': instance.payload

lib/screens/issue.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/cupertino.dart';
+
+class IssueScreen extends StatelessWidget {
+  @override
+  Widget build(context) {
+    return CupertinoPageScaffold(
+      navigationBar: CupertinoNavigationBar(
+        middle: Text("issue"),
+      ),
+      child: Text("issue"),
+    );
+  }
+}