From 9ba2cf32080fa527ea425d991f3ac6b1b11e8aa7 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Tue, 6 Oct 2020 20:52:40 +0800 Subject: [PATCH] refactor: rename data query methods to fetch --- lib/scaffolds/list_stateful.dart | 8 ++++---- lib/scaffolds/refresh_stateful.dart | 6 +++--- lib/screens/bb_commits.dart | 2 +- lib/screens/bb_explore.dart | 2 +- lib/screens/bb_issues.dart | 2 +- lib/screens/bb_object.dart | 2 +- lib/screens/bb_pulls.dart | 2 +- lib/screens/bb_repo.dart | 2 +- lib/screens/bb_teams.dart | 2 +- lib/screens/bb_user.dart | 2 +- lib/screens/gh_commits.dart | 2 +- lib/screens/gh_compare.dart | 2 +- lib/screens/gh_contributors.dart | 2 +- lib/screens/gh_events.dart | 2 +- lib/screens/gh_files.dart | 2 +- lib/screens/gh_gists.dart | 2 +- lib/screens/gh_gists_files.dart | 2 +- lib/screens/gh_issues.dart | 2 +- lib/screens/gh_news.dart | 2 +- lib/screens/gh_object.dart | 2 +- lib/screens/gh_org_repos.dart | 2 +- lib/screens/gh_orgs.dart | 2 +- lib/screens/gh_pulls.dart | 2 +- lib/screens/gh_repo.dart | 2 +- lib/screens/gh_repos.dart | 2 +- lib/screens/gh_user.dart | 2 +- lib/screens/gh_users.dart | 2 +- lib/screens/gl_blob.dart | 2 +- lib/screens/gl_commit.dart | 2 +- lib/screens/gl_commits.dart | 2 +- lib/screens/gl_explore.dart | 2 +- lib/screens/gl_group.dart | 2 +- lib/screens/gl_groups.dart | 2 +- lib/screens/gl_issue.dart | 2 +- lib/screens/gl_issues.dart | 2 +- lib/screens/gl_members.dart | 2 +- lib/screens/gl_merge_requests.dart | 2 +- lib/screens/gl_project.dart | 2 +- lib/screens/gl_project_activity.dart | 2 +- lib/screens/gl_starrers.dart | 2 +- lib/screens/gl_todos.dart | 2 +- lib/screens/gl_tree.dart | 2 +- lib/screens/gl_user.dart | 2 +- lib/screens/gt_commits.dart | 2 +- lib/screens/gt_issues.dart | 2 +- lib/screens/gt_object.dart | 2 +- lib/screens/gt_orgs.dart | 2 +- lib/screens/gt_repo.dart | 2 +- lib/screens/gt_repos.dart | 2 +- lib/screens/gt_status.dart | 2 +- lib/screens/gt_user.dart | 2 +- lib/screens/gt_users.dart | 2 +- 52 files changed, 57 insertions(+), 57 deletions(-) diff --git a/lib/scaffolds/list_stateful.dart b/lib/scaffolds/list_stateful.dart index bdc7b80..80809f0 100644 --- a/lib/scaffolds/list_stateful.dart +++ b/lib/scaffolds/list_stateful.dart @@ -26,12 +26,12 @@ class ListStatefulScaffold extends StatefulWidget { final Widget title; final Widget Function() actionBuilder; final Widget Function(T payload) itemBuilder; - final Future> Function(K cursor) onLoadMore; + final Future> Function(K cursor) fetch; ListStatefulScaffold({ @required this.title, @required this.itemBuilder, - @required this.onLoadMore, + @required this.fetch, this.actionBuilder, }); @@ -95,7 +95,7 @@ class _ListStatefulScaffoldState } }); try { - var _payload = await widget.onLoadMore(null); + var _payload = await widget.fetch(null); items = _payload.items; cursor = _payload.cursor; hasMore = _payload.hasMore; @@ -118,7 +118,7 @@ class _ListStatefulScaffoldState loadingMore = true; }); try { - var _payload = await widget.onLoadMore(cursor); + var _payload = await widget.fetch(cursor); items.addAll(_payload.items); cursor = _payload.cursor; hasMore = _payload.hasMore; diff --git a/lib/scaffolds/refresh_stateful.dart b/lib/scaffolds/refresh_stateful.dart index 7a9f61a..f0244bf 100644 --- a/lib/scaffolds/refresh_stateful.dart +++ b/lib/scaffolds/refresh_stateful.dart @@ -7,7 +7,7 @@ class RefreshStatefulScaffold extends StatefulWidget { final Widget title; final Widget Function(T data, void Function(VoidCallback fn) setState) bodyBuilder; - final Future Function() fetchData; + final Future Function() fetch; final Widget Function(T data, void Function(VoidCallback fn) setState) actionBuilder; final Widget action; @@ -16,7 +16,7 @@ class RefreshStatefulScaffold extends StatefulWidget { RefreshStatefulScaffold({ @required this.title, @required this.bodyBuilder, - @required this.fetchData, + @required this.fetch, this.actionBuilder, this.action, this.canRefresh = true, @@ -46,7 +46,7 @@ class _RefreshStatefulScaffoldState _error = ''; _loading = true; }); - _data = await widget.fetchData(); + _data = await widget.fetch(); } catch (err) { _error = err.toString(); throw err; diff --git a/lib/screens/bb_commits.dart b/lib/screens/bb_commits.dart index b1921c4..1702e13 100644 --- a/lib/screens/bb_commits.dart +++ b/lib/screens/bb_commits.dart @@ -17,7 +17,7 @@ class BbCommitsScreen extends StatelessWidget { final auth = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle('Commits'), - onLoadMore: (nextUrl) async { + fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories/$owner/$name/commits/$ref'); return ListPayload( diff --git a/lib/screens/bb_explore.dart b/lib/screens/bb_explore.dart index 3843a46..bc6bdf4 100644 --- a/lib/screens/bb_explore.dart +++ b/lib/screens/bb_explore.dart @@ -11,7 +11,7 @@ class BbExploreScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Explore'), - onLoadMore: (nextUrl) async { + fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories?role=member&sort=-updated_on'); return ListPayload( diff --git a/lib/screens/bb_issues.dart b/lib/screens/bb_issues.dart index 5b8c92b..54a3098 100644 --- a/lib/screens/bb_issues.dart +++ b/lib/screens/bb_issues.dart @@ -17,7 +17,7 @@ class BbIssuesScreen extends StatelessWidget { final auth = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle('Issues'), - onLoadMore: (nextUrl) async { + fetch: (nextUrl) async { final res = await context .read() .fetchBbWithPage(nextUrl ?? '/repositories/$owner/$name/issues'); diff --git a/lib/screens/bb_object.dart b/lib/screens/bb_object.dart index 04e5e4a..6a59e83 100644 --- a/lib/screens/bb_object.dart +++ b/lib/screens/bb_object.dart @@ -24,7 +24,7 @@ class BbObjectScreen extends StatelessWidget { final auth = Provider.of(context); return RefreshStatefulScaffold( title: AppBarTitle(path ?? 'Files'), - fetchData: () async { + fetch: () async { final res = await auth .fetchBb('/repositories/$owner/$name/src/$ref/${path ?? ''}'); if (res.headers[HttpHeaders.contentTypeHeader] == 'text/plain') { diff --git a/lib/screens/bb_pulls.dart b/lib/screens/bb_pulls.dart index ca00834..330ff80 100644 --- a/lib/screens/bb_pulls.dart +++ b/lib/screens/bb_pulls.dart @@ -17,7 +17,7 @@ class BbPullsScreen extends StatelessWidget { final auth = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle('Pull requests'), - onLoadMore: (nextUrl) async { + fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories/$owner/$name/pullrequests'); return ListPayload( diff --git a/lib/screens/bb_repo.dart b/lib/screens/bb_repo.dart index c2f243f..6a9a331 100644 --- a/lib/screens/bb_repo.dart +++ b/lib/screens/bb_repo.dart @@ -23,7 +23,7 @@ class BbRepoScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold>( title: AppBarTitle('Repository'), - fetchData: () async { + fetch: () async { final auth = context.read(); final r = await auth.fetchBbJson('/repositories/$owner/$name'); final repo = BbRepo.fromJson(r); diff --git a/lib/screens/bb_teams.dart b/lib/screens/bb_teams.dart index 311c118..3ed158c 100644 --- a/lib/screens/bb_teams.dart +++ b/lib/screens/bb_teams.dart @@ -12,7 +12,7 @@ class BbTeamsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Teams'), - onLoadMore: (nextUrl) async { + fetch: (nextUrl) async { final res = await context .read() .fetchBbWithPage(nextUrl ?? '/teams?role=member'); diff --git a/lib/screens/bb_user.dart b/lib/screens/bb_user.dart index 6508e7d..d5d8d76 100644 --- a/lib/screens/bb_user.dart +++ b/lib/screens/bb_user.dart @@ -27,7 +27,7 @@ class BbUserScreen extends StatelessWidget { : isTeam ? 'Team' : 'User'), - fetchData: () async { + fetch: () async { final res = await Future.wait([ auth.fetchBbJson('/${isTeam ? 'teams' : 'users'}/$_accountId'), auth.fetchBbWithPage('/repositories/$_login'), diff --git a/lib/screens/gh_commits.dart b/lib/screens/gh_commits.dart index 1791586..807c41e 100644 --- a/lib/screens/gh_commits.dart +++ b/lib/screens/gh_commits.dart @@ -29,7 +29,7 @@ class GhCommitsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Commits'), - onLoadMore: (cursor) async { + fetch: (cursor) async { final res = await context.read().gqlClient.execute( GhCommitsQuery( variables: GhCommitsArguments( diff --git a/lib/screens/gh_compare.dart b/lib/screens/gh_compare.dart index 54523fa..56a67b2 100644 --- a/lib/screens/gh_compare.dart +++ b/lib/screens/gh_compare.dart @@ -18,7 +18,7 @@ class GhComparisonScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: AppBarTitle('Files'), - fetchData: () async { + fetch: () async { final res = await context.read().ghClient.getJSON( '/repos/$owner/$name/compare/$before...$head', convert: (vs) => GithubComparisonItem.fromJson(vs)); diff --git a/lib/screens/gh_contributors.dart b/lib/screens/gh_contributors.dart index 1531ed1..9961191 100644 --- a/lib/screens/gh_contributors.dart +++ b/lib/screens/gh_contributors.dart @@ -15,7 +15,7 @@ class GhContributorsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Contributors'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context .read() diff --git a/lib/screens/gh_events.dart b/lib/screens/gh_events.dart index 7c083d4..a18c3d2 100644 --- a/lib/screens/gh_events.dart +++ b/lib/screens/gh_events.dart @@ -17,7 +17,7 @@ class GhEventsScreen extends StatelessWidget { return ListStatefulScaffold( title: AppBarTitle('Events'), itemBuilder: (payload) => EventItem(payload), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final events = await context.read().ghClient.getJSON( '/users/$login/events?page=$page&per_page=$pageSize', diff --git a/lib/screens/gh_files.dart b/lib/screens/gh_files.dart index c0c7e9e..39c2926 100644 --- a/lib/screens/gh_files.dart +++ b/lib/screens/gh_files.dart @@ -26,7 +26,7 @@ class GhFilesScreen extends StatelessWidget { ], ); }, - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context .read() diff --git a/lib/screens/gh_gists.dart b/lib/screens/gh_gists.dart index 6fec420..edf19f9 100644 --- a/lib/screens/gh_gists.dart +++ b/lib/screens/gh_gists.dart @@ -15,7 +15,7 @@ class GhGistsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Gists'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context .read() diff --git a/lib/screens/gh_gists_files.dart b/lib/screens/gh_gists_files.dart index 6b657f1..a7f2867 100644 --- a/lib/screens/gh_gists_files.dart +++ b/lib/screens/gh_gists_files.dart @@ -16,7 +16,7 @@ class GhGistsFilesScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: AppBarTitle('Files'), - fetchData: () async { + fetch: () async { final data = await context.read().ghClient.getJSON( '/gists/$id', convert: (vs) => GithubGistsItem.fromJson(vs)); diff --git a/lib/screens/gh_issues.dart b/lib/screens/gh_issues.dart index 8794255..d446281 100644 --- a/lib/screens/gh_issues.dart +++ b/lib/screens/gh_issues.dart @@ -22,7 +22,7 @@ class GhIssuesScreen extends StatelessWidget { iconData: Octicons.plus, url: '/github/$owner/$name/issues/new', ), - onLoadMore: (cursor) async { + fetch: (cursor) async { final res = await context.read().gqlClient.execute(GhIssuesQuery( variables: GhIssuesArguments( diff --git a/lib/screens/gh_news.dart b/lib/screens/gh_news.dart index 0c421cf..b6a6b9a 100644 --- a/lib/screens/gh_news.dart +++ b/lib/screens/gh_news.dart @@ -37,7 +37,7 @@ class GhNewsScreenState extends State { return ListStatefulScaffold( title: AppBarTitle('News'), itemBuilder: (payload) => EventItem(payload), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final login = auth.activeAccount.login; diff --git a/lib/screens/gh_object.dart b/lib/screens/gh_object.dart index 45cebf2..b416616 100644 --- a/lib/screens/gh_object.dart +++ b/lib/screens/gh_object.dart @@ -23,7 +23,7 @@ class GhObjectScreen extends StatelessWidget { return RefreshStatefulScaffold( // canRefresh: !_isImage, // TODO: title: AppBarTitle(path == null ? 'Files' : path), - fetchData: () async { + fetch: () async { // Do not request again for images if (path != null && raw != null && diff --git a/lib/screens/gh_org_repos.dart b/lib/screens/gh_org_repos.dart index 10a37bb..8cb8d81 100644 --- a/lib/screens/gh_org_repos.dart +++ b/lib/screens/gh_org_repos.dart @@ -20,7 +20,7 @@ class GhOrgReposScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Repositories'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final rs = await context .read() diff --git a/lib/screens/gh_orgs.dart b/lib/screens/gh_orgs.dart index 137aa1d..d2757e1 100644 --- a/lib/screens/gh_orgs.dart +++ b/lib/screens/gh_orgs.dart @@ -14,7 +14,7 @@ class GhUserOrganizationScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Organizations'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context .read() diff --git a/lib/screens/gh_pulls.dart b/lib/screens/gh_pulls.dart index f85df29..9041bb0 100644 --- a/lib/screens/gh_pulls.dart +++ b/lib/screens/gh_pulls.dart @@ -16,7 +16,7 @@ class GhPullsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Pull requests'), - onLoadMore: (cursor) async { + fetch: (cursor) async { final res = await context.read().gqlClient.execute(GhPullsQuery( variables: GhPullsArguments( diff --git a/lib/screens/gh_repo.dart b/lib/screens/gh_repo.dart index 16e174a..b891d9e 100644 --- a/lib/screens/gh_repo.dart +++ b/lib/screens/gh_repo.dart @@ -43,7 +43,7 @@ class GhRepoScreen extends StatelessWidget { final theme = Provider.of(context); return RefreshStatefulScaffold( title: AppBarTitle('Repository'), - fetchData: () async { + fetch: () async { var res = await context.read().gqlClient.execute(GhRepoQuery( variables: GhRepoArguments( owner: owner, diff --git a/lib/screens/gh_repos.dart b/lib/screens/gh_repos.dart index 6e137bf..8bd1fde 100644 --- a/lib/screens/gh_repos.dart +++ b/lib/screens/gh_repos.dart @@ -23,7 +23,7 @@ class GhReposScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(title), - onLoadMore: (cursor) async { + fetch: (cursor) async { final auth = context.read(); final res = await auth.gqlClient.execute(GhReposQuery( variables: diff --git a/lib/screens/gh_user.dart b/lib/screens/gh_user.dart index 6effc38..0904616 100644 --- a/lib/screens/gh_user.dart +++ b/lib/screens/gh_user.dart @@ -292,7 +292,7 @@ class GhUserScreen extends StatelessWidget { Widget build(BuildContext context) { final auth = Provider.of(context); return RefreshStatefulScaffold( - fetchData: () async { + fetch: () async { final data = await auth.gqlClient.execute(GhUserQuery( variables: GhUserArguments(login: login ?? '', isViewer: isViewer))); diff --git a/lib/screens/gh_users.dart b/lib/screens/gh_users.dart index 55b108c..055bf1b 100644 --- a/lib/screens/gh_users.dart +++ b/lib/screens/gh_users.dart @@ -88,7 +88,7 @@ class GhUsersScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(_title), - onLoadMore: (cursor) async { + fetch: (cursor) async { final auth = context.read(); final res = await auth.gqlClient.execute(GhUsersQuery( variables: GhUsersArguments( diff --git a/lib/screens/gl_blob.dart b/lib/screens/gl_blob.dart index ebffa28..8c3539c 100644 --- a/lib/screens/gl_blob.dart +++ b/lib/screens/gl_blob.dart @@ -18,7 +18,7 @@ class GlBlobScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: AppBarTitle(path ?? ''), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await auth.fetchGitlab( '/projects/$id/repository/files/${path.urlencode}?ref=$ref'); diff --git a/lib/screens/gl_commit.dart b/lib/screens/gl_commit.dart index 2d3d0e6..7e0d5c8 100644 --- a/lib/screens/gl_commit.dart +++ b/lib/screens/gl_commit.dart @@ -30,7 +30,7 @@ class GlCommitScreen extends StatelessWidget { return RefreshStatefulScaffold>( title: AppBarTitle('Commits'), - fetchData: () => _query(context), + fetch: () => _query(context), bodyBuilder: (items, _) { return Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/screens/gl_commits.dart b/lib/screens/gl_commits.dart index 906aadc..63be95a 100644 --- a/lib/screens/gl_commits.dart +++ b/lib/screens/gl_commits.dart @@ -16,7 +16,7 @@ class GlCommitsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Commits'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final res = await auth diff --git a/lib/screens/gl_explore.dart b/lib/screens/gl_explore.dart index cd85f63..7c00d70 100644 --- a/lib/screens/gl_explore.dart +++ b/lib/screens/gl_explore.dart @@ -12,7 +12,7 @@ class GlExploreScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Explore'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final res = await auth.fetchGitlabWithPage( diff --git a/lib/screens/gl_group.dart b/lib/screens/gl_group.dart index 130c56d..996ebcb 100644 --- a/lib/screens/gl_group.dart +++ b/lib/screens/gl_group.dart @@ -19,7 +19,7 @@ class GlGroupScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold>( title: Text('Group'), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await Future.wait([ auth.fetchGitlab('/groups/$id'), diff --git a/lib/screens/gl_groups.dart b/lib/screens/gl_groups.dart index 2f295f6..6cacede 100644 --- a/lib/screens/gl_groups.dart +++ b/lib/screens/gl_groups.dart @@ -11,7 +11,7 @@ class GlGroupsScreenn extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Groups'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final res = await auth.fetchGitlabWithPage('/groups?page=$page'); diff --git a/lib/screens/gl_issue.dart b/lib/screens/gl_issue.dart index e652b2a..37cfbf7 100644 --- a/lib/screens/gl_issue.dart +++ b/lib/screens/gl_issue.dart @@ -20,7 +20,7 @@ class GlIssueScreen extends StatelessWidget { return RefreshStatefulScaffold< Tuple3, List>>( title: Text('Issue #$iid'), - fetchData: () async { + fetch: () async { final type = isMr ? 'merge_requests' : 'issues'; final auth = context.read(); final items = await Future.wait([ diff --git a/lib/screens/gl_issues.dart b/lib/screens/gl_issues.dart index e0cb490..1a7069e 100644 --- a/lib/screens/gl_issues.dart +++ b/lib/screens/gl_issues.dart @@ -17,7 +17,7 @@ class GlIssuesScreen extends StatelessWidget { return ListStatefulScaffold( title: AppBarTitle('Issues'), // TODO: create issue - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final res = await auth.fetchGitlabWithPage( diff --git a/lib/screens/gl_members.dart b/lib/screens/gl_members.dart index 3d09dc5..46ba156 100644 --- a/lib/screens/gl_members.dart +++ b/lib/screens/gl_members.dart @@ -24,7 +24,7 @@ class GlMembersScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Members'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final res = diff --git a/lib/screens/gl_merge_requests.dart b/lib/screens/gl_merge_requests.dart index 6e8eac1..217f021 100644 --- a/lib/screens/gl_merge_requests.dart +++ b/lib/screens/gl_merge_requests.dart @@ -16,7 +16,7 @@ class GlMergeRequestsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Merge Requests'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context.read().fetchGitlabWithPage( '/projects/$id/merge_requests?state=opened&page=$page'); diff --git a/lib/screens/gl_project.dart b/lib/screens/gl_project.dart index e2f959b..260131d 100644 --- a/lib/screens/gl_project.dart +++ b/lib/screens/gl_project.dart @@ -27,7 +27,7 @@ class GlProjectScreen extends StatelessWidget { Tuple5, List, int, String>>( title: AppBarTitle('Project'), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await Future.wait([ auth.fetchGitlab('/projects/$id?statistics=1'), diff --git a/lib/screens/gl_project_activity.dart b/lib/screens/gl_project_activity.dart index 2ba815c..11df033 100644 --- a/lib/screens/gl_project_activity.dart +++ b/lib/screens/gl_project_activity.dart @@ -18,7 +18,7 @@ class GlProjectActivityScreen extends StatelessWidget { final theme = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle('Activity'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final auth = context.read(); final vs = await auth.fetchGitlab('/projects/$id/events'); diff --git a/lib/screens/gl_starrers.dart b/lib/screens/gl_starrers.dart index 02f4740..088adf7 100644 --- a/lib/screens/gl_starrers.dart +++ b/lib/screens/gl_starrers.dart @@ -15,7 +15,7 @@ class GlStarrersScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Members'), - onLoadMore: (page) async { + fetch: (page) async { page = page ?? 1; final res = await context .read() diff --git a/lib/screens/gl_todos.dart b/lib/screens/gl_todos.dart index 8acffed..09570aa 100644 --- a/lib/screens/gl_todos.dart +++ b/lib/screens/gl_todos.dart @@ -63,7 +63,7 @@ class GlTodosScreen extends StatelessWidget { return RefreshStatefulScaffold>( title: Text('Todos'), - fetchData: () async { + fetch: () async { final vs = await context.read().fetchGitlab('/todos'); return (vs as List).map((v) => GitlabTodo.fromJson(v)); }, diff --git a/lib/screens/gl_tree.dart b/lib/screens/gl_tree.dart index f77ef61..5e12603 100644 --- a/lib/screens/gl_tree.dart +++ b/lib/screens/gl_tree.dart @@ -19,7 +19,7 @@ class GlTreeScreen extends StatelessWidget { final auth = Provider.of(context); return RefreshStatefulScaffold>( title: AppBarTitle(path ?? 'Files'), - fetchData: () async { + fetch: () async { final uri = Uri( path: '/projects/$id/repository/tree', queryParameters: { diff --git a/lib/screens/gl_user.dart b/lib/screens/gl_user.dart index f21ec3a..302208e 100644 --- a/lib/screens/gl_user.dart +++ b/lib/screens/gl_user.dart @@ -20,7 +20,7 @@ class GlUserScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold>>( title: Text(isViewer ? 'Me' : 'User'), - fetchData: () async { + fetch: () async { final auth = context.read(); final _id = id ?? auth.activeAccount.gitlabId; final res = await Future.wait([ diff --git a/lib/screens/gt_commits.dart b/lib/screens/gt_commits.dart index 3a1e424..549ceae 100644 --- a/lib/screens/gt_commits.dart +++ b/lib/screens/gt_commits.dart @@ -16,7 +16,7 @@ class GtCommitsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Commits'), - onLoadMore: (page) async { + fetch: (page) async { final res = await context .read() .fetchGiteaWithPage('/repos/$owner/$name/commits', page: page); diff --git a/lib/screens/gt_issues.dart b/lib/screens/gt_issues.dart index 7249167..730acf9 100644 --- a/lib/screens/gt_issues.dart +++ b/lib/screens/gt_issues.dart @@ -17,7 +17,7 @@ class GtIssuesScreen extends StatelessWidget { return ListStatefulScaffold( title: AppBarTitle(isPr ? 'Pull Requests' : 'Issues'), // TODO: create issue - onLoadMore: (page) async { + fetch: (page) async { final type = isPr ? 'pulls' : 'issues'; final res = await context.read().fetchGiteaWithPage( '/repos/$owner/$name/issues?state=open&type=$type', diff --git a/lib/screens/gt_object.dart b/lib/screens/gt_object.dart index 49331f2..e3267f3 100644 --- a/lib/screens/gt_object.dart +++ b/lib/screens/gt_object.dart @@ -19,7 +19,7 @@ class GtObjectScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: AppBarTitle(path ?? 'Files'), - fetchData: () async { + fetch: () async { final suffix = path == null ? '' : '/$path'; final res = await context .read() diff --git a/lib/screens/gt_orgs.dart b/lib/screens/gt_orgs.dart index 20548e5..b0093bd 100644 --- a/lib/screens/gt_orgs.dart +++ b/lib/screens/gt_orgs.dart @@ -15,7 +15,7 @@ class GtOrgsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle('Organizations'), - onLoadMore: (page) async { + fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); return ListPayload( diff --git a/lib/screens/gt_repo.dart b/lib/screens/gt_repo.dart index f6883a6..30b463d 100644 --- a/lib/screens/gt_repo.dart +++ b/lib/screens/gt_repo.dart @@ -22,7 +22,7 @@ class GtRepoScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold>( title: AppBarTitle('Repository'), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await Future.wait([ auth.fetchGitea('/repos/$owner/$name'), diff --git a/lib/screens/gt_repos.dart b/lib/screens/gt_repos.dart index d42e8f1..57d59b8 100644 --- a/lib/screens/gt_repos.dart +++ b/lib/screens/gt_repos.dart @@ -28,7 +28,7 @@ class GtReposScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(title), - onLoadMore: (page) async { + fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); return ListPayload( diff --git a/lib/screens/gt_status.dart b/lib/screens/gt_status.dart index 83d77da..d3d8bf0 100644 --- a/lib/screens/gt_status.dart +++ b/lib/screens/gt_status.dart @@ -11,7 +11,7 @@ class GtStatusScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: Text('Gitea status'), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await Future.wait([ auth.fetchGitea('/version'), diff --git a/lib/screens/gt_user.dart b/lib/screens/gt_user.dart index 306749f..f4b6633 100644 --- a/lib/screens/gt_user.dart +++ b/lib/screens/gt_user.dart @@ -55,7 +55,7 @@ class GtUserScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( title: Text(isViewer ? 'Me' : login), - fetchData: () async { + fetch: () async { final auth = context.read(); final res = await Future.wait([ auth.fetchGitea('/orgs/$login'), diff --git a/lib/screens/gt_users.dart b/lib/screens/gt_users.dart index f842e54..3c0170d 100644 --- a/lib/screens/gt_users.dart +++ b/lib/screens/gt_users.dart @@ -31,7 +31,7 @@ class GtUsersScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( title: AppBarTitle(title), - onLoadMore: (page) async { + fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); return ListPayload(