From 36e505d511b0b877ea9a3e2298aa70ff4ab2897c Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Tue, 4 Oct 2022 01:05:29 +0800 Subject: [PATCH] style: fix lint warnings --- lib/home.dart | 2 +- lib/models/auth.dart | 16 ++++++++-------- lib/scaffolds/list_stateful.dart | 2 +- lib/scaffolds/long_list.dart | 2 +- lib/scaffolds/refresh_stateful.dart | 4 ++-- lib/scaffolds/tab_stateful.dart | 2 +- lib/screens/about.dart | 2 +- lib/screens/bb_issue_comment.dart | 2 +- lib/screens/bb_issue_form.dart | 2 +- lib/screens/bb_object.dart | 4 ++-- lib/screens/ge_issue_comment.dart | 2 +- lib/screens/ge_issue_form.dart | 2 +- lib/screens/ge_search.dart | 4 ++-- lib/screens/gh_events.dart | 4 ++-- lib/screens/gh_issue_form.dart | 2 +- lib/screens/gh_news.dart | 4 ++-- lib/screens/gh_search.dart | 8 ++++---- lib/screens/gl_issue_form.dart | 2 +- lib/screens/gl_search.dart | 2 +- lib/screens/gt_issue_comment.dart | 2 +- lib/screens/gt_issue_form.dart | 2 +- lib/screens/login.dart | 2 +- lib/utils/utils.dart | 4 ++-- lib/widgets/comment_item.dart | 2 +- lib/widgets/event_item.dart | 2 +- lib/widgets/html_view.dart | 2 +- lib/widgets/link.dart | 2 +- lib/widgets/notification_item.dart | 2 +- pubspec.lock | 2 +- pubspec.yaml | 1 + 30 files changed, 46 insertions(+), 45 deletions(-) diff --git a/lib/home.dart b/lib/home.dart index 7cb2ac7..f658da9 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -33,7 +33,7 @@ import 'package:universal_io/io.dart'; class Home extends StatefulWidget { @override - _HomeState createState() => _HomeState(); + State createState() => _HomeState(); } class _HomeState extends State { diff --git a/lib/models/auth.dart b/lib/models/auth.dart index c3753ac..a3fa9b1 100644 --- a/lib/models/auth.dart +++ b/lib/models/auth.dart @@ -200,7 +200,7 @@ class AuthModel with ChangeNotifier { hasMore: next != null, total: int.tryParse( res.headers['X-Total'] ?? res.headers['x-total'] ?? '') ?? - TOTAL_COUNT_FALLBACK, + kTotalCountFallback, ); } @@ -285,7 +285,7 @@ class AuthModel with ChangeNotifier { Future fetchGiteaWithPage(String path, {int? page, int? limit}) async { page = page ?? 1; - limit = limit ?? PAGE_SIZE; + limit = limit ?? kPageSize; var uri = Uri.parse('${activeAccount!.domain}/api/v1$path'); uri = uri.replace( @@ -303,7 +303,7 @@ class AuthModel with ChangeNotifier { cursor: page + 1, hasMore: info is List && info.isNotEmpty, total: int.tryParse(res.headers['x-total-count'] ?? '') ?? - TOTAL_COUNT_FALLBACK, + kTotalCountFallback, ); } @@ -389,7 +389,7 @@ class AuthModel with ChangeNotifier { Future fetchGogsWithPage(String path, {int? page, int? limit}) async { page = page ?? 1; - limit = limit ?? PAGE_SIZE; + limit = limit ?? kPageSize; var uri = Uri.parse('${activeAccount!.domain}/api/v1$path'); uri = uri.replace( @@ -407,7 +407,7 @@ class AuthModel with ChangeNotifier { cursor: page + 1, hasMore: info is List && info.isNotEmpty, total: int.tryParse(res.headers['x-total-count'] ?? '') ?? - TOTAL_COUNT_FALLBACK, + kTotalCountFallback, ); } @@ -476,7 +476,7 @@ class AuthModel with ChangeNotifier { Future fetchGiteeWithPage(String path, {int? page, int? limit}) async { page = page ?? 1; - limit = limit ?? PAGE_SIZE; + limit = limit ?? kPageSize; var uri = Uri.parse('${activeAccount!.domain}/api/v5$path'); uri = uri.replace( @@ -491,7 +491,7 @@ class AuthModel with ChangeNotifier { final totalPage = int.tryParse(res.headers['total_page'] ?? ''); final totalCount = - int.tryParse(res.headers['total_count'] ?? '') ?? TOTAL_COUNT_FALLBACK; + int.tryParse(res.headers['total_count'] ?? '') ?? kTotalCountFallback; return DataWithPage( data: info, @@ -542,7 +542,7 @@ class AuthModel with ChangeNotifier { userInfo: '${activeAccount!.login}:${activeAccount!.appPassword}', path: input.path, queryParameters: { - 'pagelen': PAGE_SIZE.toString(), + 'pagelen': kPageSize.toString(), ...input.queryParameters }, ); diff --git a/lib/scaffolds/list_stateful.dart b/lib/scaffolds/list_stateful.dart index 5a71ce2..b964f65 100644 --- a/lib/scaffolds/list_stateful.dart +++ b/lib/scaffolds/list_stateful.dart @@ -22,7 +22,7 @@ class ListStatefulScaffold extends StatefulWidget { final Future> Function(K? cursor) fetch; @override - _ListStatefulScaffoldState createState() => + State> createState() => _ListStatefulScaffoldState(); } diff --git a/lib/scaffolds/long_list.dart b/lib/scaffolds/long_list.dart index fc5f412..4e523e8 100644 --- a/lib/scaffolds/long_list.dart +++ b/lib/scaffolds/long_list.dart @@ -41,7 +41,7 @@ class LongListStatefulScaffold extends StatefulWidget { final Future> Function(String? cursor) onLoadMore; @override - _LongListStatefulScaffoldState createState() => + State> createState() => _LongListStatefulScaffoldState(); } diff --git a/lib/scaffolds/refresh_stateful.dart b/lib/scaffolds/refresh_stateful.dart index d57d681..885fe07 100644 --- a/lib/scaffolds/refresh_stateful.dart +++ b/lib/scaffolds/refresh_stateful.dart @@ -18,10 +18,10 @@ class RefreshStatefulScaffold extends StatefulWidget { final Widget? Function(T data, void Function(T newData) setData)? actionBuilder; final Widget? action; - final canRefresh; + final bool canRefresh; @override - _RefreshStatefulScaffoldState createState() => + State> createState() => _RefreshStatefulScaffoldState(); } diff --git a/lib/scaffolds/tab_stateful.dart b/lib/scaffolds/tab_stateful.dart index a558872..4cf1ba9 100644 --- a/lib/scaffolds/tab_stateful.dart +++ b/lib/scaffolds/tab_stateful.dart @@ -18,7 +18,7 @@ class TabStatefulScaffold extends StatefulWidget { final Widget Function(T payload, void Function() refresh)? actionBuilder; @override - _TabStatefulScaffoldState createState() => _TabStatefulScaffoldState(); + State> createState() => _TabStatefulScaffoldState(); } class _TabStatefulScaffoldState extends State> { diff --git a/lib/screens/about.dart b/lib/screens/about.dart index 369beb7..af6c7f1 100644 --- a/lib/screens/about.dart +++ b/lib/screens/about.dart @@ -10,7 +10,7 @@ // /// Unused // class AboutScreen extends StatefulWidget { // @override -// _AboutScreenState createState() => _AboutScreenState(); +// State createState() => _AboutScreenState(); // } // class _AboutScreenState extends State { diff --git a/lib/screens/bb_issue_comment.dart b/lib/screens/bb_issue_comment.dart index 83d71be..79b6fec 100644 --- a/lib/screens/bb_issue_comment.dart +++ b/lib/screens/bb_issue_comment.dart @@ -13,7 +13,7 @@ class BbIssueCommentScreen extends StatefulWidget { final String number; @override - _BbIssueCommentScreenState createState() => _BbIssueCommentScreenState(); + State createState() => _BbIssueCommentScreenState(); } class _BbIssueCommentScreenState extends State { diff --git a/lib/screens/bb_issue_form.dart b/lib/screens/bb_issue_form.dart index 38aacd3..5c4eab4 100644 --- a/lib/screens/bb_issue_form.dart +++ b/lib/screens/bb_issue_form.dart @@ -13,7 +13,7 @@ class BbIssueFormScreen extends StatefulWidget { final String name; @override - _BbIssueFormScreenState createState() => _BbIssueFormScreenState(); + State createState() => _BbIssueFormScreenState(); } class _BbIssueFormScreenState extends State { diff --git a/lib/screens/bb_object.dart b/lib/screens/bb_object.dart index b51c949..91c169c 100644 --- a/lib/screens/bb_object.dart +++ b/lib/screens/bb_object.dart @@ -8,7 +8,7 @@ import 'package:git_touch/widgets/action_entry.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; -import 'package:path/path.dart'; +import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; import 'package:universal_io/io.dart'; @@ -54,7 +54,7 @@ class BbObjectScreen extends StatelessWidget { return BlobView(path, text: pl); } else if (pl is BbTree) { return createObjectTreeItem( - name: basename(pl.path), + name: p.basename(pl.path), type: pl.type, // size: v.type == 'commit_file' ? v.size : null, size: pl.size, diff --git a/lib/screens/ge_issue_comment.dart b/lib/screens/ge_issue_comment.dart index dd24607..f7d3f45 100644 --- a/lib/screens/ge_issue_comment.dart +++ b/lib/screens/ge_issue_comment.dart @@ -17,7 +17,7 @@ class GeIssueCommentScreen extends StatefulWidget { final String id; @override - _GeIssueCommentScreenState createState() => _GeIssueCommentScreenState(); + State createState() => _GeIssueCommentScreenState(); } class _GeIssueCommentScreenState extends State { diff --git a/lib/screens/ge_issue_form.dart b/lib/screens/ge_issue_form.dart index 878408e..fc7949d 100644 --- a/lib/screens/ge_issue_form.dart +++ b/lib/screens/ge_issue_form.dart @@ -13,7 +13,7 @@ class GeIssueFormScreen extends StatefulWidget { final String name; @override - _GeIssueFormScreenState createState() => _GeIssueFormScreenState(); + State createState() => _GeIssueFormScreenState(); } class _GeIssueFormScreenState extends State { diff --git a/lib/screens/ge_search.dart b/lib/screens/ge_search.dart index eb3d497..2c400b1 100644 --- a/lib/screens/ge_search.dart +++ b/lib/screens/ge_search.dart @@ -15,7 +15,7 @@ import 'package:timeago/timeago.dart' as timeago; class GeSearchScreen extends StatefulWidget { @override - _GeSearchScreenState createState() => _GeSearchScreenState(); + State createState() => _GeSearchScreenState(); } class _GeSearchScreenState extends State { @@ -107,7 +107,7 @@ class _GeSearchScreenState extends State { author: p.user.login, avatarUrl: p.user.avatarUrl, commentCount: p.comments, - subtitle: '#' + p.number, + subtitle: '#${p.number}', title: p.title, updatedAt: DateTime.parse(p.updatedAt), url: diff --git a/lib/screens/gh_events.dart b/lib/screens/gh_events.dart index 4861605..77ab261 100644 --- a/lib/screens/gh_events.dart +++ b/lib/screens/gh_events.dart @@ -20,12 +20,12 @@ class GhEventsScreen extends StatelessWidget { fetch: (page) async { page = page ?? 1; final events = await context.read().ghClient.getJSON( - '/users/$login/events?page=$page&per_page=$PAGE_SIZE', + '/users/$login/events?page=$page&per_page=$kPageSize', convert: (dynamic vs) => [for (var v in vs) GithubEvent.fromJson(v)]); return ListPayload( cursor: page + 1, - hasMore: events.length == PAGE_SIZE, + hasMore: events.length == kPageSize, items: events, ); }, diff --git a/lib/screens/gh_issue_form.dart b/lib/screens/gh_issue_form.dart index 46f040a..454e210 100644 --- a/lib/screens/gh_issue_form.dart +++ b/lib/screens/gh_issue_form.dart @@ -13,7 +13,7 @@ class GhIssueFormScreen extends StatefulWidget { final String name; @override - _GhIssueFormScreenState createState() => _GhIssueFormScreenState(); + State createState() => _GhIssueFormScreenState(); } class _GhIssueFormScreenState extends State { diff --git a/lib/screens/gh_news.dart b/lib/screens/gh_news.dart index 791b1fe..f2526cf 100644 --- a/lib/screens/gh_news.dart +++ b/lib/screens/gh_news.dart @@ -43,12 +43,12 @@ class GhNewsScreenState extends State { final login = auth.activeAccount!.login; final events = await auth.ghClient.getJSON( - '/users/$login/received_events?page=$page&per_page=$PAGE_SIZE', + '/users/$login/received_events?page=$page&per_page=$kPageSize', convert: (dynamic vs) => [for (var v in vs) GithubEvent.fromJson(v)], ); return ListPayload( cursor: page + 1, - hasMore: events.length == PAGE_SIZE, + hasMore: events.length == kPageSize, items: events, ); }, diff --git a/lib/screens/gh_search.dart b/lib/screens/gh_search.dart index 6aa8238..bc8f988 100644 --- a/lib/screens/gh_search.dart +++ b/lib/screens/gh_search.dart @@ -14,7 +14,7 @@ import 'package:timeago/timeago.dart' as timeago; class GhSearchScreen extends StatefulWidget { @override - _GhSearchScreenState createState() => _GhSearchScreenState(); + State createState() => _GhSearchScreenState(); } class _GhSearchScreenState extends State { @@ -49,7 +49,7 @@ class _GhSearchScreenState extends State { final auth = context.read(); final data = await auth.query(''' { - repository: search(first: $PAGE_SIZE, type: REPOSITORY, query: "$keyword") { + repository: search(first: $kPageSize, type: REPOSITORY, query: "$keyword") { nodes { ... on Repository { owner { @@ -75,7 +75,7 @@ class _GhSearchScreenState extends State { } } } - user: search(first: $PAGE_SIZE, type: USER, query: "$keyword") { + user: search(first: $kPageSize, type: USER, query: "$keyword") { nodes { ... on Organization { __typename @@ -89,7 +89,7 @@ class _GhSearchScreenState extends State { } } } - issue: search(first: $PAGE_SIZE, type: ISSUE, query: "$keyword") { + issue: search(first: $kPageSize, type: ISSUE, query: "$keyword") { nodes { ... on PullRequest { __typename diff --git a/lib/screens/gl_issue_form.dart b/lib/screens/gl_issue_form.dart index 3e3adad..126c937 100644 --- a/lib/screens/gl_issue_form.dart +++ b/lib/screens/gl_issue_form.dart @@ -12,7 +12,7 @@ class GlIssueFormScreen extends StatefulWidget { final int id; @override - _GlIssueFormScreenState createState() => _GlIssueFormScreenState(); + State createState() => _GlIssueFormScreenState(); } class _GlIssueFormScreenState extends State { diff --git a/lib/screens/gl_search.dart b/lib/screens/gl_search.dart index b53e1f2..2ab9317 100644 --- a/lib/screens/gl_search.dart +++ b/lib/screens/gl_search.dart @@ -14,7 +14,7 @@ import 'package:timeago/timeago.dart' as timeago; class GlSearchScreen extends StatefulWidget { @override - _GlSearchScreenState createState() => _GlSearchScreenState(); + State createState() => _GlSearchScreenState(); } class _GlSearchScreenState extends State { diff --git a/lib/screens/gt_issue_comment.dart b/lib/screens/gt_issue_comment.dart index 0edc3ab..407beb6 100644 --- a/lib/screens/gt_issue_comment.dart +++ b/lib/screens/gt_issue_comment.dart @@ -17,7 +17,7 @@ class GtIssueCommentScreen extends StatefulWidget { final String id; @override - _GtIssueCommentScreenState createState() => _GtIssueCommentScreenState(); + State createState() => _GtIssueCommentScreenState(); } class _GtIssueCommentScreenState extends State { diff --git a/lib/screens/gt_issue_form.dart b/lib/screens/gt_issue_form.dart index ac61c64..6d1f78b 100644 --- a/lib/screens/gt_issue_form.dart +++ b/lib/screens/gt_issue_form.dart @@ -13,7 +13,7 @@ class GtIssueFormScreen extends StatefulWidget { final String name; @override - _GtIssueFormScreenState createState() => _GtIssueFormScreenState(); + State createState() => _GtIssueFormScreenState(); } class _GtIssueFormScreenState extends State { diff --git a/lib/screens/login.dart b/lib/screens/login.dart index 07e95d3..c8723d3 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -17,7 +17,7 @@ import 'package:provider/provider.dart'; class LoginScreen extends StatefulWidget { @override - _LoginScreenState createState() => _LoginScreenState(); + State createState() => _LoginScreenState(); } class _LoginScreenState extends State { diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 181f61b..c5f59ee 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -76,7 +76,7 @@ class GithubPalette { } // final pageSize = 5; -const PAGE_SIZE = 30; +const kPageSize = 30; List join(T seperator, List xs) { final result = []; @@ -131,7 +131,7 @@ int sortByKey(T key, T a, T b) { return 0; } -const TOTAL_COUNT_FALLBACK = 999; // TODO: +const kTotalCountFallback = 999; // TODO: class ListPayload { ListPayload({ diff --git a/lib/widgets/comment_item.dart b/lib/widgets/comment_item.dart index d5dc5d4..5e22982 100644 --- a/lib/widgets/comment_item.dart +++ b/lib/widgets/comment_item.dart @@ -85,7 +85,7 @@ class GhEmojiAction extends StatefulWidget { final Iterable items; final EmojiUpdateCallaback onReaction; @override - _GhEmojiActionState createState() => _GhEmojiActionState(); + State createState() => _GhEmojiActionState(); } class _GhEmojiActionState extends State { diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index 1b3477c..f2ace08 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -482,7 +482,7 @@ class EventItem extends StatelessWidget { ); case 'MarketplacePurchaseEvent': final action = e.payload!.action; - var messageToDisplay; + String? messageToDisplay; switch (action) { case 'purchased': messageToDisplay = diff --git a/lib/widgets/html_view.dart b/lib/widgets/html_view.dart index a258bfa..4e61780 100644 --- a/lib/widgets/html_view.dart +++ b/lib/widgets/html_view.dart @@ -12,7 +12,7 @@ class HtmlView extends StatefulWidget { final String html; @override - _HtmlViewState createState() => _HtmlViewState(); + State createState() => _HtmlViewState(); } class _HtmlViewState extends State { diff --git a/lib/widgets/link.dart b/lib/widgets/link.dart index e36199f..7425884 100644 --- a/lib/widgets/link.dart +++ b/lib/widgets/link.dart @@ -8,7 +8,7 @@ class CupertinoLink extends StatefulWidget { final Function? onTap; @override - _CupertinoLinkState createState() => _CupertinoLinkState(); + State createState() => _CupertinoLinkState(); } class _CupertinoLinkState extends State { diff --git a/lib/widgets/notification_item.dart b/lib/widgets/notification_item.dart index c0bde2d..d2322f0 100644 --- a/lib/widgets/notification_item.dart +++ b/lib/widgets/notification_item.dart @@ -17,7 +17,7 @@ class NotificationItem extends StatefulWidget { final Function markAsRead; @override - _NotificationItemState createState() => _NotificationItemState(); + State createState() => _NotificationItemState(); } class _NotificationItemState extends State { diff --git a/pubspec.lock b/pubspec.lock index 6b70b2a..9b9109a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -624,7 +624,7 @@ packages: source: hosted version: "2.1.0" path: - dependency: transitive + dependency: "direct main" description: name: path url: "https://pub.dartlang.org" diff --git a/pubspec.yaml b/pubspec.yaml index 9df2e9c..59ee852 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -73,6 +73,7 @@ dependencies: go_router: from_css_color: maps_launcher: + path: antd_mobile: path: ../ant-design-mobile-flutter