1
0
mirror of https://github.com/git-touch/git-touch synced 2025-02-02 08:56:54 +01:00

refactor: use null operators

This commit is contained in:
Rongjian Zhang 2021-06-14 00:59:06 +08:00
parent 17b6fd5d78
commit ac02fd705a
7 changed files with 21 additions and 28 deletions

View File

@ -213,7 +213,7 @@ class _ListStatefulScaffoldState<T, K>
return CommonScaffold( return CommonScaffold(
title: widget.title, title: widget.title,
body: _buildBody(), body: _buildBody(),
action: widget.actionBuilder == null ? null : widget.actionBuilder!(), action: widget.actionBuilder?.call(),
); );
} }
} }

View File

@ -64,7 +64,7 @@ class BbRepoScreen extends StatelessWidget {
text: Text('Code'), text: Text('Code'),
rightWidget: Text(filesize(p.size)), rightWidget: Text(filesize(p.size)),
url: url:
'/bitbucket/$owner/$name/src/${branch == null ? p.mainbranch!.name : branch}', '/bitbucket/$owner/$name/src/${branch ?? p.mainbranch!.name}',
), ),
TableViewItem( TableViewItem(
leftIconData: Octicons.issue_opened, leftIconData: Octicons.issue_opened,
@ -80,16 +80,15 @@ class BbRepoScreen extends StatelessWidget {
leftIconData: Octicons.history, leftIconData: Octicons.history,
text: Text('Commits'), text: Text('Commits'),
url: url:
'/bitbucket/$owner/$name/commits/${branch == null ? p.mainbranch!.name : branch}', '/bitbucket/$owner/$name/commits/${branch ?? p.mainbranch!.name}',
), ),
if (branches != null) if (branches != null)
TableViewItem( TableViewItem(
leftIconData: Octicons.git_branch, leftIconData: Octicons.git_branch,
text: Text(AppLocalizations.of(context)!.branches), text: Text(AppLocalizations.of(context)!.branches),
rightWidget: Text( rightWidget: Text((branch ?? p.mainbranch!.name)! +
(branch == null ? p.mainbranch!.name : branch)! + '' +
'' + branches.length.toString()),
branches.length.toString()),
onTap: () async { onTap: () async {
if (branches.length < 2) return; if (branches.length < 2) return;

View File

@ -139,8 +139,7 @@ class GeRepoScreen extends StatelessWidget {
leftIconData: Octicons.code, leftIconData: Octicons.code,
text: Text('Code'), text: Text('Code'),
rightWidget: Text(p.license ?? ''), rightWidget: Text(p.license ?? ''),
url: url: '/gitee/$owner/$name/tree/${branch ?? p.defaultBranch}',
'/gitee/$owner/$name/tree/${branch == null ? p.defaultBranch : branch}',
), ),
TableViewItem( TableViewItem(
leftIconData: Octicons.issue_opened, leftIconData: Octicons.issue_opened,
@ -158,16 +157,15 @@ class GeRepoScreen extends StatelessWidget {
leftIconData: Octicons.history, leftIconData: Octicons.history,
text: Text('Commits'), text: Text('Commits'),
url: url:
'/gitee/$owner/$name/commits?branch=${branch == null ? p.defaultBranch : branch}', '/gitee/$owner/$name/commits?branch=${branch ?? p.defaultBranch}',
), ),
if (branches != null) if (branches != null)
TableViewItem( TableViewItem(
leftIconData: Octicons.git_branch, leftIconData: Octicons.git_branch,
text: Text(AppLocalizations.of(context)!.branches), text: Text(AppLocalizations.of(context)!.branches),
rightWidget: Text( rightWidget: Text((branch ?? p.defaultBranch)! +
(branch == null ? p.defaultBranch : branch)! + '' +
'' + branches.length.toString()),
branches.length.toString()),
onTap: () async { onTap: () async {
if (branches.length < 2) return; if (branches.length < 2) return;

View File

@ -22,7 +22,7 @@ class GhObjectScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return RefreshStatefulScaffold<RepositoryContents>( return RefreshStatefulScaffold<RepositoryContents>(
// canRefresh: !_isImage, // TODO: // canRefresh: !_isImage, // TODO:
title: AppBarTitle(path == null ? 'Files' : path), title: AppBarTitle(path ?? 'Files'),
fetch: () async { fetch: () async {
// Do not request again for images // Do not request again for images
if (path != null && if (path != null &&

View File

@ -199,17 +199,16 @@ class GlProjectScreen extends StatelessWidget {
? null ? null
: Text(p.statistics!.commitCount.toString()), : Text(p.statistics!.commitCount.toString()),
url: url:
'/gitlab/projects/$id/commits?prefix=$prefix&branch=${branch == null ? p.defaultBranch : branch}', // EDIT '/gitlab/projects/$id/commits?prefix=$prefix&branch=${branch ?? p.defaultBranch}', // EDIT
), ),
if (branches != null) if (branches != null)
TableViewItem( TableViewItem(
leftIconData: Octicons.git_branch, leftIconData: Octicons.git_branch,
text: Text(AppLocalizations.of(context)!.branches), text: Text(AppLocalizations.of(context)!.branches),
rightWidget: Text( rightWidget: Text(((branch ?? p.defaultBranch) ??
((branch == null ? p.defaultBranch : branch) ?? '' /** empty project */) +
'' /** empty project */) + '' +
'' + branches.length.toString()),
branches.length.toString()),
onTap: () async { onTap: () async {
if (branches.length < 2) return; if (branches.length < 2) return;

View File

@ -57,8 +57,7 @@ class GoObjectScreen extends StatelessWidget {
]); ]);
} else { } else {
final v = GogsBlob.fromJson(p); final v = GogsBlob.fromJson(p);
return BlobView(v.name, return BlobView(v.name, base64Text: v.content);
base64Text: v.content == null ? '' : v.content);
} }
}, },
); );

View File

@ -94,8 +94,7 @@ class GoRepoScreen extends StatelessWidget {
TableViewItem( TableViewItem(
leftIconData: Octicons.code, leftIconData: Octicons.code,
text: Text('Code'), text: Text('Code'),
url: url: '/gogs/$owner/$name/blob?ref=${branch ?? 'master'}',
'/gogs/$owner/$name/blob?ref=${branch == null ? 'master' : branch}',
), ),
TableViewItem( TableViewItem(
leftIconData: Octicons.issue_opened, leftIconData: Octicons.issue_opened,
@ -110,13 +109,12 @@ class GoRepoScreen extends StatelessWidget {
TableViewItem( TableViewItem(
leftIconData: Octicons.history, leftIconData: Octicons.history,
text: Text('Commits'), text: Text('Commits'),
url: url: '/gogs/$owner/$name/commits?ref=${branch ?? 'master'}',
'/gogs/$owner/$name/commits?ref=${branch == null ? 'master' : branch}',
), ),
TableViewItem( TableViewItem(
leftIconData: Octicons.git_branch, leftIconData: Octicons.git_branch,
text: Text(AppLocalizations.of(context)!.branches), text: Text(AppLocalizations.of(context)!.branches),
rightWidget: Text((branch == null ? 'master' : branch)! + rightWidget: Text((branch ?? 'master')! +
'' + '' +
'${branches == null ? '1' : branches.length.toString()}'), '${branches == null ? '1' : branches.length.toString()}'),
onTap: () async { onTap: () async {