Gitea
/
git-touch-android-ios-app
mirror of https://github.com/git-touch/git-touch
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: files list with table view

This commit is contained in:
Rongjian Zhang 2019-09-15 00:01:15 +08:00
parent 124ec611ad
commit c14fdb4a1d
3 changed files with 53 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/screens/object.dart
View File

@ -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 [
SizedBox(width: 6),
SetiIcon(item['name'], size: 28),
SizedBox(width: 6),
];
return SetiIcon(item['name'], size: 36);
case 'tree':
case 'commit':
return [
SizedBox(width: 10),
Icon(
item['type'] == 'tree'
? Octicons.file_directory
: Octicons.file_submodule,
color: _iconDefaultColor,
size: 20,
),
SizedBox(width: 10),
];
return Icon(
item['type'] == 'tree'
? Octicons.file_directory
: Octicons.file_submodule,
color: _iconDefaultColor,
size: 24,
);
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(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: join(
borderView,
entries.map((item) {
return Link(
screenBuilder: item['type'] == 'commit'
? null
: (context) {
// TODO: All image types
var ext = path.extension(item['name']);
if (ext.isNotEmpty) ext = ext.substring(1);
if (['png', 'jpg', 'jpeg', 'gif', 'webp'].contains(ext)) {
return ImageView(NetworkImage('$rawUrl/' + item['name']));
}
return ObjectScreen(
name: name,
owner: owner,
branch: branch,
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(),
),
return TableView(
items: entries.map((item) {
return TableViewItem(
leftWidget: _buildIcon(item),
text: Text(item['name']),
screenBuilder: (_) {
if (item['type'] == 'commit') return null;
// TODO: All image types
var ext = path.extension(item['name']);
if (ext.isNotEmpty) ext = ext.substring(1);
if (['png', 'jpg', 'jpeg', 'gif', 'webp'].contains(ext)) {
return ImageView(NetworkImage('$rawUrl/' + item['name']));
}
return ObjectScreen(
name: name,
owner: owner,
branch: branch,
paths: [...paths, item['name']],
type: item['type'],
);
});
}),
);
}
@ -148,6 +125,7 @@ class ObjectScreen extends StatelessWidget {
language: extname.isEmpty ? 'plaintext' : extname,
theme: githubTheme,
padding: EdgeInsets.all(10),
textStyle: TextStyle(fontFamily: monospaceFont),
),
);
}

2
lib/utils/utils.dart
View File

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

41
lib/widgets/table_view.dart
View File

@ -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: 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),
SizedBox(width: 44, child: leftWidget),
Expanded(child: item.text),
if (item.rightWidget != null) item.rightWidget,
if ((item.onTap != null || item.screenBuilder != null) &
!item.hideRightChevron)
if ((item.onTap != null || item.screenBuilder != null) &&
!item.hideRightChevron) ...[
Icon(CupertinoIcons.right_chevron,
size: 24, color: PrimerColors.gray400),
SizedBox(width: 4),
size: 24, color: PrimerColors.gray300),
SizedBox(width: 4),
],
]),
),
);