From fdc087278911bc52b05c00947877494c53ca6a54 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sun, 12 May 2019 14:01:12 +0800 Subject: [PATCH] refactor: use spread operator --- lib/screens/login.dart | 48 +++++++++++++++++----------------- lib/screens/notifications.dart | 11 ++++---- lib/screens/organization.dart | 6 +---- lib/widgets/event_item.dart | 15 ++++++----- lib/widgets/table_view.dart | 5 ++-- pubspec.yaml | 2 +- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/lib/screens/login.dart b/lib/screens/login.dart index 7321d5d..ee61701 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -101,30 +101,30 @@ class _LoginScreenState extends State { return Container( child: Column( - children: settings.githubAccountMap.entries - .map((entry) => _buildAccountItem(AccountModel( - avatarUrl: entry.value.avatarUrl, - token: entry.value.token, - platform: PlatformType.github, - domain: 'https://github.com', - login: entry.key))) - .toList() - ..addAll(accounts.map(_buildAccountItem)) - ..addAll([ - _buildAddItem( - text: 'GitHub Account', - onTap: () { - var state = settings.generateRandomString(); - launch( - 'https://github.com/login/oauth/authorize?client_id=$clientId&redirect_uri=gittouch://login&scope=user%20repo&state=$state', - ); - }, - ), - // _buildAddItem( - // text: 'GitLab Account', - // screenBuilder: (_) => LoginGitlabScreen(), - // ) - ]), + children: [ + ...settings.githubAccountMap.entries + .map((entry) => _buildAccountItem(AccountModel( + avatarUrl: entry.value.avatarUrl, + token: entry.value.token, + platform: PlatformType.github, + domain: 'https://github.com', + login: entry.key))) + .toList(), + ...accounts.map(_buildAccountItem), + _buildAddItem( + text: 'GitHub Account', + onTap: () { + var state = settings.generateRandomString(); + launch( + 'https://github.com/login/oauth/authorize?client_id=$clientId&redirect_uri=gittouch://login&scope=user%20repo&state=$state', + ); + }, + ), + // _buildAddItem( + // text: 'GitLab Account', + // screenBuilder: (_) => LoginGitlabScreen(), + // ) + ], ), ); }, diff --git a/lib/screens/notifications.dart b/lib/screens/notifications.dart index 827cd67..d56ed3b 100644 --- a/lib/screens/notifications.dart +++ b/lib/screens/notifications.dart @@ -274,11 +274,12 @@ $key: pullRequest(number: ${item.number}) { bodyBuilder: () { return groupMap.isEmpty ? EmptyWidget() - : Column( - children: [Padding(padding: EdgeInsets.only(top: 10))]..addAll( - groupMap.entries - .map((entry) => _buildGroupItem(context, entry)) - .toList())); + : Column(children: [ + Padding(padding: EdgeInsets.only(top: 10)), + ...groupMap.entries + .map((entry) => _buildGroupItem(context, entry)) + .toList() + ]); }, ); } diff --git a/lib/screens/organization.dart b/lib/screens/organization.dart index 9ce4e8e..8dc805b 100644 --- a/lib/screens/organization.dart +++ b/lib/screens/organization.dart @@ -134,9 +134,7 @@ class _OrganizationScreenState extends State { onRefresh: query, title: Text(widget.login), trailingBuilder: (payload) { - List actions = []; - - actions.addAll([ + return ActionButton(title: 'User Actions', actions: [ Action( text: 'Share', onPress: () { @@ -150,8 +148,6 @@ class _OrganizationScreenState extends State { }, ), ]); - - return ActionButton(title: 'User Actions', actions: actions); }, bodyBuilder: (payload) { return Column( diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index ce125fd..2e8e625 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -56,12 +56,6 @@ class EventItem extends StatelessWidget { IconData iconData = Octicons.octoface, WidgetBuilder screenBuilder, }) { - var _spans = [ - createLinkSpan( - context, event.actorLogin, () => UserScreen(event.actorLogin)) - ]; - _spans.addAll(spans); - return Container( padding: EdgeInsets.all(8), child: Column( @@ -76,7 +70,14 @@ class EventItem extends StatelessWidget { text: TextSpan( style: TextStyle( color: Colors.black, height: 1.3, fontSize: 15), - children: _spans, + children: [ + createLinkSpan( + context, + event.actorLogin, + () => UserScreen(event.actorLogin), + ), + ...spans, + ], ), ), ), diff --git a/lib/widgets/table_view.dart b/lib/widgets/table_view.dart index 8686084..da2c139 100644 --- a/lib/widgets/table_view.dart +++ b/lib/widgets/table_view.dart @@ -46,7 +46,7 @@ class TableView extends StatelessWidget { ), padding: EdgeInsets.only(top: 4), ), - ]..addAll(items.map((item) { + ...items.map((item) { List children = [ Expanded( child: Text( @@ -71,7 +71,8 @@ class TableView extends StatelessWidget { child: Row(children: children), ), ); - }).toList()), + }).toList() + ], ), ); } diff --git a/pubspec.yaml b/pubspec.yaml index ac27b2a..9e023fa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.3.0-dev <3.0.0" dependencies: flutter: