refactor: object tree widget

lib/screens/gitlab_tree.dart

@@ -2,13 +2,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:git_touch/models/gitlab.dart';
 import 'package:git_touch/scaffolds/refresh_stateful.dart';
 import 'package:git_touch/widgets/app_bar_title.dart';
-import 'package:git_touch/widgets/table_view.dart';
+import 'package:git_touch/widgets/object_tree.dart';
 import 'package:flutter/material.dart';
 import 'package:git_touch/models/auth.dart';
 import 'package:provider/provider.dart';
 import 'package:git_touch/utils/utils.dart';
-import 'package:primer/primer.dart';
-import 'package:seti/seti.dart';
 
 final gitlabTreeRouter = RouterScreen(
     '/gitlab/projects/:id/tree',
@@ -18,29 +16,8 @@ final gitlabTreeRouter = RouterScreen(
 class GitlabTreeScreen extends StatelessWidget {
   final int id;
   final String path;
-
   GitlabTreeScreen(this.id, {this.path});
 
-  static const _iconDefaultColor = PrimerColors.blue300;
-
-  Widget _buildIcon(GitlabTreeItem item) {
-    switch (item.type) {
-      case 'blob':
-        return SetiIcon(item.path, size: 36);
-      case 'tree':
-      case 'commit':
-        return Icon(
-          item.type == 'tree'
-              ? Octicons.file_directory
-              : Octicons.file_submodule,
-          color: _iconDefaultColor,
-          size: 24,
-        );
-      default:
-        return null;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return RefreshStatefulScaffold<Iterable<GitlabTreeItem>>(
@@ -54,12 +31,11 @@ class GitlabTreeScreen extends StatelessWidget {
         return (res as List).map((v) => GitlabTreeItem.fromJson(v));
       },
       bodyBuilder: (data, _) {
-        return TableView(
+        return ObjectTree(
-          hasIcon: true,
           items: data.map((item) {
-            return TableViewItem(
+            return ObjectTreeItem(
-              leftWidget: _buildIcon(item),
+              type: item.type,
-              text: Text(item.name),
+              name: item.name,
               url: (() {
                 switch (item.type) {
                   case 'tree':

lib/screens/object.dart

@@ -8,7 +8,7 @@ import 'package:git_touch/scaffolds/refresh_stateful.dart';
 import 'package:git_touch/widgets/action_entry.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:git_touch/widgets/object_tree.dart';
 import 'package:path/path.dart' as p;
 import 'package:flutter/material.dart';
 import 'package:flutter_highlight/flutter_highlight.dart';
@@ -16,8 +16,6 @@ import 'package:git_touch/models/auth.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:provider/provider.dart';
 import 'package:git_touch/utils/utils.dart';
-import 'package:primer/primer.dart';
-import 'package:seti/seti.dart';
 
 final objectRouter = RouterScreen(
   '/:owner/:name/blob/:ref',
@@ -52,26 +50,6 @@ class ObjectScreen extends StatelessWidget {
   String get rawUrl =>
       'https://raw.githubusercontent.com/$owner/$name/$branch/$_path'; // TODO:
 
-  static const _iconDefaultColor = PrimerColors.blue300;
-
-  Widget _buildIcon(GhObjectTreeEntry item) {
-    switch (item.type) {
-      case 'blob':
-        return SetiIcon(item.name, size: 36);
-      case 'tree':
-      case 'commit':
-        return Icon(
-          item.type == 'tree'
-              ? Octicons.file_directory
-              : Octicons.file_submodule,
-          color: _iconDefaultColor,
-          size: 24,
-        );
-      default:
-        return null;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return RefreshStatefulScaffold<GhObjectGitObject>(
@@ -121,20 +99,12 @@ class ObjectScreen extends StatelessWidget {
       bodyBuilder: (data, _) {
         switch (data.resolveType) {
           case 'Tree':
-            final tree = data as GhObjectTree;
+            return ObjectTree(
-
+              items: (data as GhObjectTree).entries.map((v) {
-            return TableView(
-              hasIcon: true,
-              items: tree.entries.map((item) {
                 // if (item.type == 'commit') return null;
-                final p = [...paths, item.name].join('/').urlencode;
+                final p = [...paths, v.name].join('/').urlencode;
                 final url = '/$owner/$name/blob/$branch?path=$p';
-
+                return ObjectTreeItem(name: v.name, type: v.type, url: url);
-                return TableViewItem(
-                  leftWidget: _buildIcon(item),
-                  text: Text(item.name),
-                  url: url,
-                );
               }),
             );
           case 'Blob':

lib/widgets/object_tree.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:git_touch/utils/utils.dart';
+import 'package:git_touch/widgets/table_view.dart';
+import 'package:primer/primer.dart';
+import 'package:seti/seti.dart';
+
+class ObjectTreeItem {
+  final String url;
+  final String name;
+  final String type;
+  ObjectTreeItem({
+    @required this.name,
+    @required this.url,
+    @required this.type,
+  });
+}
+
+class ObjectTree extends StatelessWidget {
+  final Iterable<ObjectTreeItem> items;
+  ObjectTree({@required this.items});
+
+  Widget _buildIcon(ObjectTreeItem item) {
+    switch (item.type) {
+      case 'blob':
+        return SetiIcon(item.name, size: 36);
+      case 'tree':
+        return Icon(
+          Octicons.file_directory,
+          color: PrimerColors.blue300,
+          size: 24,
+        );
+      case 'commit':
+        return Icon(
+          Octicons.file_submodule,
+          color: PrimerColors.blue300,
+          size: 24,
+        );
+      default:
+        throw 'object type error';
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return TableView(
+      hasIcon: true,
+      items: [
+        for (var item in items)
+          TableViewItem(
+            leftWidget: _buildIcon(item),
+            text: Text(item.name),
+            url: item.url,
+          )
+      ],
+    );
+  }
+}