refactor: files list with table view

lib/screens/object.dart

@@ -2,6 +2,7 @@ import 'package:flutter_highlight/themes/github.dart';
 import 'package:git_touch/screens/image_view.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
 import 'package:git_touch/widgets/markdown_view.dart';
+import 'package:git_touch/widgets/table_view.dart';
 import 'package:path/path.dart' as path;
 import 'package:flutter/material.dart';
 import 'package:flutter_highlight/flutter_highlight.dart';
@@ -42,29 +43,21 @@ class ObjectScreen extends StatelessWidget {
 
   static const _iconDefaultColor = PrimerColors.blue300;
 
-  List<Widget> _buildIcon(item) {
+  Widget _buildIcon(item) {
     switch (item['type']) {
       case 'blob':
-        return [
+        return SetiIcon(item['name'], size: 36);
-          SizedBox(width: 6),
-          SetiIcon(item['name'], size: 28),
-          SizedBox(width: 6),
-        ];
       case 'tree':
       case 'commit':
-        return [
+        return Icon(
-          SizedBox(width: 10),
+          item['type'] == 'tree'
-          Icon(
+              ? Octicons.file_directory
-            item['type'] == 'tree'
+              : Octicons.file_submodule,
-                ? Octicons.file_directory
+          color: _iconDefaultColor,
-                : Octicons.file_submodule,
+          size: 24,
-            color: _iconDefaultColor,
+        );
-            size: 20,
-          ),
-          SizedBox(width: 10),
-        ];
       default:
-        return [];
+        throw 'Should not be here';
     }
   }
 
@@ -91,44 +84,28 @@ class ObjectScreen extends StatelessWidget {
 
   Widget _buildTree(payload) {
     var entries = payload['entries'] as List;
-    return Column(
+    return TableView(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
+      items: entries.map((item) {
-      children: join(
+        return TableViewItem(
-        borderView,
+            leftWidget: _buildIcon(item),
-        entries.map((item) {
+            text: Text(item['name']),
-          return Link(
+            screenBuilder: (_) {
-            screenBuilder: item['type'] == 'commit'
+              if (item['type'] == 'commit') return null;
-                ? null
+              // TODO: All image types
-                : (context) {
+              var ext = path.extension(item['name']);
-                    // TODO: All image types
+              if (ext.isNotEmpty) ext = ext.substring(1);
-                    var ext = path.extension(item['name']);
+              if (['png', 'jpg', 'jpeg', 'gif', 'webp'].contains(ext)) {
-                    if (ext.isNotEmpty) ext = ext.substring(1);
+                return ImageView(NetworkImage('$rawUrl/' + item['name']));
-                    if (['png', 'jpg', 'jpeg', 'gif', 'webp'].contains(ext)) {
+              }
-                      return ImageView(NetworkImage('$rawUrl/' + item['name']));
+              return ObjectScreen(
-                    }
+                name: name,
-                    return ObjectScreen(
+                owner: owner,
-                      name: name,
+                branch: branch,
-                      owner: owner,
+                paths: [...paths, item['name']],
-                      branch: branch,
+                type: item['type'],
-                      paths: [...paths, item['name']],
+              );
-                      type: item['type'],
+            });
-                    );
+      }),
-                  },
-            child: Container(
-              height: 40,
-              child: Row(
-                children: <Widget>[
-                  ..._buildIcon(item),
-                  Expanded(
-                      child: Text(item['name'],
-                          style: TextStyle(
-                              fontSize: 16, color: PrimerColors.gray900)))
-                ],
-              ),
-            ),
-          );
-        }).toList(),
-      ),
     );
   }
 
@@ -148,6 +125,7 @@ class ObjectScreen extends StatelessWidget {
             language: extname.isEmpty ? 'plaintext' : extname,
             theme: githubTheme,
             padding: EdgeInsets.all(10),
+            textStyle: TextStyle(fontFamily: monospaceFont),
           ),
         );
     }

lib/utils/utils.dart

@@ -147,7 +147,7 @@ class BorderView extends StatelessWidget {
 
   const BorderView({
     this.height = 1,
-    this.color = PrimerColors.gray200,
+    this.color = PrimerColors.gray100,
     this.leftPadding = 0,
   });
 

lib/widgets/table_view.dart

@@ -24,7 +24,7 @@ class TableViewItem {
   final bool hideRightChevron;
 
   TableViewItem({
-    this.text,
+    @required this.text,
     this.leftIconData,
     this.leftWidget,
     this.rightWidget,
@@ -36,42 +36,37 @@ class TableViewItem {
 
 class TableView extends StatelessWidget {
   final String headerText;
-  final List<TableViewItem> items;
+  final Iterable<TableViewItem> items;
 
   TableView({this.headerText, @required this.items});
 
   Widget _buildItem(TableViewItem item) {
     if (item == null) return null;
 
+    var leftWidget = item.leftWidget ?? Icon(item.leftIconData);
+    // Container(
+    //   width: 24,
+    //   height: 24,
+    //   // decoration: BoxDecoration(
+    //   //     borderRadius: BorderRadius.circular(4), color: PrimerColors.blue400),
+    //   child: Icon(iconData, size: 24, color: PrimerColors.gray600),
+    // )
+
     var widget = DefaultTextStyle(
       style: TextStyle(fontSize: 16, color: PrimerColors.gray900),
       overflow: TextOverflow.ellipsis,
-      child: Container(
+      child: SizedBox(
         height: 44,
         child: Row(children: [
-          if (item.leftIconData != null) ...[
+          SizedBox(width: 44, child: leftWidget),
-            SizedBox(width: 12),
-            Icon(item.leftIconData),
-            // Container(
-            //   width: 24,
-            //   height: 24,
-            //   // decoration: BoxDecoration(
-            //   //     borderRadius: BorderRadius.circular(4), color: PrimerColors.blue400),
-            //   child: Icon(iconData, size: 24, color: PrimerColors.gray600),
-            // )
-          ],
-          if (item.leftWidget != null) ...[
-            SizedBox(width: 12),
-            item.leftWidget,
-          ],
-          SizedBox(width: 12),
           Expanded(child: item.text),
           if (item.rightWidget != null) item.rightWidget,
-          if ((item.onTap != null || item.screenBuilder != null) &
+          if ((item.onTap != null || item.screenBuilder != null) &&
-              !item.hideRightChevron)
+              !item.hideRightChevron) ...[
             Icon(CupertinoIcons.right_chevron,
-                size: 24, color: PrimerColors.gray400),
+                size: 24, color: PrimerColors.gray300),
-          SizedBox(width: 4),
+            SizedBox(width: 4),
+          ],
         ]),
       ),
     );