From 30eb0ef5b3f2094af368161db7f812616fec157c Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sat, 30 Jan 2021 15:42:02 +0800 Subject: [PATCH] refactor: fix dart lint --- analysis_options.yaml | 3 +++ lib/scaffolds/refresh_stateful.dart | 6 +++--- lib/screens/bb_issue_comment.dart | 2 +- lib/screens/bb_issue_form.dart | 2 +- lib/screens/bb_issues.dart | 1 - lib/screens/ge_issue_comment.dart | 4 ++-- lib/screens/ge_user.dart | 1 - lib/screens/gh_object.dart | 2 ++ lib/screens/gh_repo.dart | 2 +- lib/screens/gh_search.dart | 18 ++++++++-------- lib/screens/gl_commit.dart | 2 +- lib/screens/gl_issue.dart | 2 +- lib/screens/gl_search.dart | 33 ++++++++++++++--------------- lib/screens/gt_issue.dart | 1 - lib/screens/gt_issue_comment.dart | 4 ++-- lib/screens/gt_issue_form.dart | 2 +- lib/screens/gt_repo.dart | 2 -- lib/screens/settings.dart | 10 ++++----- 18 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 analysis_options.yaml diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..7fca59b --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,3 @@ +analyzer: + exclude: + - lib/**/*.g.dart diff --git a/lib/scaffolds/refresh_stateful.dart b/lib/scaffolds/refresh_stateful.dart index f0244bf..584a5b6 100644 --- a/lib/scaffolds/refresh_stateful.dart +++ b/lib/scaffolds/refresh_stateful.dart @@ -29,7 +29,7 @@ class RefreshStatefulScaffold extends StatefulWidget { class _RefreshStatefulScaffoldState extends State> { - bool _loading; + // bool _loading; T _data; String _error = ''; @@ -44,7 +44,7 @@ class _RefreshStatefulScaffoldState try { setState(() { _error = ''; - _loading = true; + // _loading = true; }); _data = await widget.fetch(); } catch (err) { @@ -53,7 +53,7 @@ class _RefreshStatefulScaffoldState } finally { if (mounted) { setState(() { - _loading = false; + // _loading = false; }); } } diff --git a/lib/screens/bb_issue_comment.dart b/lib/screens/bb_issue_comment.dart index e95af19..22f2718 100644 --- a/lib/screens/bb_issue_comment.dart +++ b/lib/screens/bb_issue_comment.dart @@ -43,7 +43,7 @@ class _BbIssueCommentScreenState extends State { CupertinoButton.filled( child: Text('Comment'), onPressed: () async { - final res = await auth.fetchBb( + await auth.fetchBb( '/repositories/${widget.owner}/${widget.name}/issues/${widget.number}/comments', isPost: true, body: { diff --git a/lib/screens/bb_issue_form.dart b/lib/screens/bb_issue_form.dart index eafd150..9ba47f6 100644 --- a/lib/screens/bb_issue_form.dart +++ b/lib/screens/bb_issue_form.dart @@ -56,7 +56,7 @@ class _BbIssueFormScreenState extends State { CupertinoButton.filled( child: Text('Submit'), onPressed: () async { - final res = await auth.fetchBbJson( + await auth.fetchBbJson( '/repositories/${widget.owner}/${widget.name}/issues', isPost: true, body: {'body': _body, 'title': _title}, diff --git a/lib/screens/bb_issues.dart b/lib/screens/bb_issues.dart index 9455342..fb1a7ad 100644 --- a/lib/screens/bb_issues.dart +++ b/lib/screens/bb_issues.dart @@ -16,7 +16,6 @@ class BbIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { - final auth = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle(S.of(context).issues), actionBuilder: () { diff --git a/lib/screens/ge_issue_comment.dart b/lib/screens/ge_issue_comment.dart index 9969272..ab84e49 100644 --- a/lib/screens/ge_issue_comment.dart +++ b/lib/screens/ge_issue_comment.dart @@ -54,13 +54,13 @@ class _GeIssueCommentScreenState extends State { child: Text('Comment'), onPressed: () async { if (!isEdit) { - final res = await auth.fetchGitee( + await auth.fetchGitee( '/repos/${widget.owner}/${widget.name}/${widget.isPr ? 'pulls' : 'issues'}/${widget.number}/comments', requestType: 'POST', body: {'body': _controller.text, 'repo': widget.name}, ); } else { - final res = await auth.fetchGitee( + await auth.fetchGitee( '/repos/${widget.owner}/${widget.name}/${widget.isPr ? 'pulls' : 'issues'}/comments/${int.parse(widget.id)}', requestType: 'PATCH', body: {'body': _controller.text, 'repo': widget.name}, diff --git a/lib/screens/ge_user.dart b/lib/screens/ge_user.dart index 0f57d81..b8445f0 100644 --- a/lib/screens/ge_user.dart +++ b/lib/screens/ge_user.dart @@ -8,7 +8,6 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/repository_item.dart'; -import 'package:git_touch/widgets/table_view.dart'; import 'package:git_touch/widgets/user_header.dart'; import 'package:provider/provider.dart'; import 'package:git_touch/widgets/action_button.dart'; diff --git a/lib/screens/gh_object.dart b/lib/screens/gh_object.dart index b416616..f52bfbe 100644 --- a/lib/screens/gh_object.dart +++ b/lib/screens/gh_object.dart @@ -52,6 +52,8 @@ class GhObjectScreen extends StatelessWidget { iconData: Icons.settings, url: '/choose-code-theme', ); + } else { + return null; } }, bodyBuilder: (data, _) { diff --git a/lib/screens/gh_repo.dart b/lib/screens/gh_repo.dart index 2374f0b..4b57a5b 100644 --- a/lib/screens/gh_repo.dart +++ b/lib/screens/gh_repo.dart @@ -136,7 +136,7 @@ class GhRepoScreen extends StatelessWidget { switch (v) { case GSubscriptionState.SUBSCRIBED: case GSubscriptionState.IGNORED: - final res = await context + await context .read() .ghClient .activity diff --git a/lib/screens/gh_search.dart b/lib/screens/gh_search.dart index 7185858..2d4318f 100644 --- a/lib/screens/gh_search.dart +++ b/lib/screens/gh_search.dart @@ -154,15 +154,15 @@ class _GhSearchScreenState extends State { static const tabs = ['Repositories', 'Users', 'Issues']; - static IconData _buildIconData(p) { - if (p['isPrivate']) { - return Octicons.lock; - } - if (p['isFork']) { - return Octicons.repo_forked; - } - return Octicons.repo; - } + // static IconData _buildIconData(p) { + // if (p['isPrivate']) { + // return Octicons.lock; + // } + // if (p['isFork']) { + // return Octicons.repo_forked; + // } + // return Octicons.repo; + // } Widget _buildItem(p) { switch (_activeTab) { diff --git a/lib/screens/gl_commit.dart b/lib/screens/gl_commit.dart index 30af2ce..13edd39 100644 --- a/lib/screens/gl_commit.dart +++ b/lib/screens/gl_commit.dart @@ -17,7 +17,7 @@ class GlCommitScreen extends StatelessWidget { final String sha; GlCommitScreen(this.id, {this.sha}); - Future> _query(BuildContext context, [int page = 1]) async { + Future> _query(BuildContext context) async { final auth = context.read(); final res = await auth .fetchGitlabWithPage('/projects/$id/repository/commits/$sha/diff'); diff --git a/lib/screens/gl_issue.dart b/lib/screens/gl_issue.dart index e056e6c..df98dd5 100644 --- a/lib/screens/gl_issue.dart +++ b/lib/screens/gl_issue.dart @@ -38,7 +38,7 @@ class GlIssueScreen extends StatelessWidget { bodyBuilder: (data, _) { final issue = data.item1; final notes = data.item2; - final emoji = data.item3; + // final emoji = data.item3; return Column( children: [ diff --git a/lib/screens/gl_search.dart b/lib/screens/gl_search.dart index e55fc33..9c361ed 100644 --- a/lib/screens/gl_search.dart +++ b/lib/screens/gl_search.dart @@ -104,23 +104,22 @@ class _GlSearchScreenState extends State { static const tabs = ['Projects', 'Users']; Widget _buildItem(_p) { - switch (_activeTab) { - case 0: - final p = _p as GitlabProject; - final updatedAt = timeago.format(p.lastActivityAt); - return RepositoryItem.gl( - payload: p, - note: 'Updated $updatedAt', - ); - case 1: - final p = _p as GitlabUser; - return UserItem.gitlab( - login: p.username, - name: p.name, - id: p.id, - avatarUrl: p.avatarUrl, - bio: Text(p.bio ?? ''), - ); + if (_activeTab == 0) { + final p = _p as GitlabProject; + final updatedAt = timeago.format(p.lastActivityAt); + return RepositoryItem.gl( + payload: p, + note: 'Updated $updatedAt', + ); + } else { + final p = _p as GitlabUser; + return UserItem.gitlab( + login: p.username, + name: p.name, + id: p.id, + avatarUrl: p.avatarUrl, + bio: Text(p.bio ?? ''), + ); } } diff --git a/lib/screens/gt_issue.dart b/lib/screens/gt_issue.dart index e71cdd8..2788f1e 100644 --- a/lib/screens/gt_issue.dart +++ b/lib/screens/gt_issue.dart @@ -74,7 +74,6 @@ class GtIssueScreen extends StatelessWidget { final issue = data.item1; final comments = data.item2; final theme = context.read(); - final auth = context.read(); return Column(children: [ Container( padding: CommonStyle.padding, diff --git a/lib/screens/gt_issue_comment.dart b/lib/screens/gt_issue_comment.dart index 20c5589..96afac9 100644 --- a/lib/screens/gt_issue_comment.dart +++ b/lib/screens/gt_issue_comment.dart @@ -54,13 +54,13 @@ class _GtIssueCommentScreenState extends State { child: Text('Comment'), onPressed: () async { if (!isEdit) { - final res = await auth.fetchGitea( + await auth.fetchGitea( '/repos/${widget.owner}/${widget.name}/${widget.isPr ? 'pulls' : 'issues'}/${widget.number}/comments', requestType: 'POST', body: {'body': _controller.text, 'repo': widget.name}, ); } else { - final res = await auth.fetchGitea( + await auth.fetchGitea( '/repos/${widget.owner}/${widget.name}/${widget.isPr ? 'pulls' : 'issues'}/comments/${int.parse(widget.id)}', requestType: 'PATCH', body: {'body': _controller.text, 'repo': widget.name}, diff --git a/lib/screens/gt_issue_form.dart b/lib/screens/gt_issue_form.dart index ce5ca04..0112dfd 100644 --- a/lib/screens/gt_issue_form.dart +++ b/lib/screens/gt_issue_form.dart @@ -56,7 +56,7 @@ class _GtIssueFormScreenState extends State { CupertinoButton.filled( child: Text('Submit'), onPressed: () async { - final res = await auth.fetchGitea( + await auth.fetchGitea( '/repos/${widget.owner}/${widget.name}/issues', requestType: 'POST', body: {'body': _body, 'title': _title}, diff --git a/lib/screens/gt_repo.dart b/lib/screens/gt_repo.dart index 4f39cc2..bc8ff19 100644 --- a/lib/screens/gt_repo.dart +++ b/lib/screens/gt_repo.dart @@ -4,7 +4,6 @@ import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; @@ -49,7 +48,6 @@ class GtRepoScreen extends StatelessWidget { return Tuple2(repo, readmeData); }, bodyBuilder: (t, setState) { - final theme = Provider.of(context); final p = t.item1; return Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index ab94205..686618e 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -15,11 +15,11 @@ import 'package:tuple/tuple.dart'; import '../generated/l10n.dart'; class SettingsScreen extends StatelessWidget { - Widget _buildRightWidget(BuildContext context, bool checked) { - final theme = Provider.of(context); - if (!checked) return null; - return Icon(Icons.check, color: theme.palette.primary, size: 24); - } + // Widget _buildRightWidget(BuildContext context, bool checked) { + // final theme = Provider.of(context); + // if (!checked) return null; + // return Icon(Icons.check, color: theme.palette.primary, size: 24); + // } @override Widget build(BuildContext context) {