From 3506609024f70968f3e1834d144a37735f1e7777 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sun, 29 Sep 2019 12:17:14 +0800 Subject: [PATCH] feat: border left padding --- lib/scaffolds/list_stateful.dart | 6 ++++-- lib/screens/commits.dart | 1 + lib/screens/issues.dart | 1 + lib/screens/news.dart | 1 + lib/screens/repositories.dart | 1 + lib/screens/users.dart | 1 + lib/utils/utils.dart | 2 +- 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/scaffolds/list_stateful.dart b/lib/scaffolds/list_stateful.dart index 2e9f1f2..2af97d8 100644 --- a/lib/scaffolds/list_stateful.dart +++ b/lib/scaffolds/list_stateful.dart @@ -24,14 +24,16 @@ class ListStatefulScaffold extends StatefulWidget { final Widget Function(T payload) itemBuilder; final Future> Function() onRefresh; final Future> Function(K cursor) onLoadMore; + final Widget borderView; ListStatefulScaffold({ @required this.title, + @required double leftPadding, @required this.itemBuilder, @required this.onRefresh, @required this.onLoadMore, this.trailingBuiler, - }); + }) : borderView = BorderView(leftPadding: leftPadding); @override _ListStatefulScaffoldState createState() => @@ -142,7 +144,7 @@ class _ListStatefulScaffoldState } if (index % 2 == 1) { - return borderView; + return widget.borderView; } return widget.itemBuilder(items[index ~/ 2]); diff --git a/lib/screens/commits.dart b/lib/screens/commits.dart index 2564906..e394ea5 100644 --- a/lib/screens/commits.dart +++ b/lib/screens/commits.dart @@ -84,6 +84,7 @@ class CommitsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Commits'), + leftPadding: 52, onRefresh: () => _query(context), onLoadMore: (cursor) => _query(context, cursor), itemBuilder: (payload) { diff --git a/lib/screens/issues.dart b/lib/screens/issues.dart index 623df84..9135e32 100644 --- a/lib/screens/issues.dart +++ b/lib/screens/issues.dart @@ -49,6 +49,7 @@ class IssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( + leftPadding: 34, title: AppBarTitle( (isPullRequest ? 'Pull requests' : 'Issues') + ' of $owner/$name'), onRefresh: () => _query(context), diff --git a/lib/screens/news.dart b/lib/screens/news.dart index cb1f005..9861d69 100644 --- a/lib/screens/news.dart +++ b/lib/screens/news.dart @@ -69,6 +69,7 @@ class NewsScreenState extends State { Widget build(context) { return ListStatefulScaffold( title: AppBarTitle('News'), + leftPadding: 62, itemBuilder: (payload) => EventItem(payload), onRefresh: fetchEvents, onLoadMore: (page) => fetchEvents(page), diff --git a/lib/screens/repositories.dart b/lib/screens/repositories.dart index 210db67..128592c 100644 --- a/lib/screens/repositories.dart +++ b/lib/screens/repositories.dart @@ -69,6 +69,7 @@ class RepositoriesScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(title), + leftPadding: 42, onRefresh: () => _queryRepos(context), onLoadMore: (cursor) => _queryRepos(context, cursor), itemBuilder: (payload) => RepositoryItem(payload), diff --git a/lib/screens/users.dart b/lib/screens/users.dart index 21ffd32..1c70689 100644 --- a/lib/screens/users.dart +++ b/lib/screens/users.dart @@ -68,6 +68,7 @@ class UsersScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(title), + leftPadding: 68, onRefresh: () => _queryUsers(context), onLoadMore: (cursor) => _queryUsers(context, cursor), itemBuilder: (payload) => UserItem.fromData(payload), diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index b8577e5..ee739a8 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -130,7 +130,7 @@ class BorderView extends StatelessWidget { const BorderView({ this.height = 0, // One physical pixel. - this.color = PrimerColors.gray500, + this.color = PrimerColors.gray400, this.leftPadding = 0, });