Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-02-20 21:40:44 +01:00
Code Issues Releases Wiki Activity

refactor: rename data query methods to fetch

Browse Source
This commit is contained in:
Rongjian Zhang 2020-10-06 20:52:40 +08:00
parent 3002c07367
commit 9ba2cf3208
52 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/scaffolds/list_stateful.dart
View File

@ -26,12 +26,12 @@ class ListStatefulScaffold<T, K> extends StatefulWidget {
final Widget title;
final Widget Function() actionBuilder;
final Widget Function(T payload) itemBuilder;
final Future<ListPayload<T, K>> Function(K cursor) onLoadMore;
final Future<ListPayload<T, K>> 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<T, K>
}
});
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<T, K>
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;

6
lib/scaffolds/refresh_stateful.dart
View File

@ -7,7 +7,7 @@ class RefreshStatefulScaffold<T> extends StatefulWidget {
final Widget title;
final Widget Function(T data, void Function(VoidCallback fn) setState)
bodyBuilder;
final Future<T> Function() fetchData;
final Future<T> Function() fetch;
final Widget Function(T data, void Function(VoidCallback fn) setState)
actionBuilder;
final Widget action;
@ -16,7 +16,7 @@ class RefreshStatefulScaffold<T> 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<T>
_error = '';
_loading = true;
});
_data = await widget.fetchData();
_data = await widget.fetch();
} catch (err) {
_error = err.toString();
throw err;

2
lib/screens/bb_commits.dart
View File

@ -17,7 +17,7 @@ class BbCommitsScreen extends StatelessWidget {
final auth = Provider.of<AuthModel>(context);
return ListStatefulScaffold<BbCommit, String>(
title: AppBarTitle('Commits'),
onLoadMore: (nextUrl) async {
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories/$owner/$name/commits/$ref');
return ListPayload(

2
lib/screens/bb_explore.dart
View File

@ -11,7 +11,7 @@ class BbExploreScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<BbRepo, String>(
title: AppBarTitle('Explore'),
onLoadMore: (nextUrl) async {
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories?role=member&sort=-updated_on');
return ListPayload(

2
lib/screens/bb_issues.dart
View File

@ -17,7 +17,7 @@ class BbIssuesScreen extends StatelessWidget {
final auth = Provider.of<AuthModel>(context);
return ListStatefulScaffold<BbIssues, String>(
title: AppBarTitle('Issues'),
onLoadMore: (nextUrl) async {
fetch: (nextUrl) async {
final res = await context
.read<AuthModel>()
.fetchBbWithPage(nextUrl ?? '/repositories/$owner/$name/issues');

2
lib/screens/bb_object.dart
View File

@ -24,7 +24,7 @@ class BbObjectScreen extends StatelessWidget {
final auth = Provider.of<AuthModel>(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') {

2
lib/screens/bb_pulls.dart
View File

@ -17,7 +17,7 @@ class BbPullsScreen extends StatelessWidget {
final auth = Provider.of<AuthModel>(context);
return ListStatefulScaffold<BbPulls, String>(
title: AppBarTitle('Pull requests'),
onLoadMore: (nextUrl) async {
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories/$owner/$name/pullrequests');
return ListPayload(

2
lib/screens/bb_repo.dart
View File

@ -23,7 +23,7 @@ class BbRepoScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<Tuple2<BbRepo, String>>(
title: AppBarTitle('Repository'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final r = await auth.fetchBbJson('/repositories/$owner/$name');
final repo = BbRepo.fromJson(r);

2
lib/screens/bb_teams.dart
View File

@ -12,7 +12,7 @@ class BbTeamsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<BbUser, String>(
title: AppBarTitle('Teams'),
onLoadMore: (nextUrl) async {
fetch: (nextUrl) async {
final res = await context
.read<AuthModel>()
.fetchBbWithPage(nextUrl ?? '/teams?role=member');

2
lib/screens/bb_user.dart
View File

@ -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'),

2
lib/screens/gh_commits.dart
View File

@ -29,7 +29,7 @@ class GhCommitsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GhCommitsCommit, String>(
title: AppBarTitle('Commits'),
onLoadMore: (cursor) async {
fetch: (cursor) async {
final res = await context.read<AuthModel>().gqlClient.execute(
GhCommitsQuery(
variables: GhCommitsArguments(

2
lib/screens/gh_compare.dart
View File

@ -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<AuthModel>().ghClient.getJSON(
'/repos/$owner/$name/compare/$before...$head',
convert: (vs) => GithubComparisonItem.fromJson(vs));

2
lib/screens/gh_contributors.dart
View File

@ -15,7 +15,7 @@ class GhContributorsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GithubContributorItem, int>(
title: AppBarTitle('Contributors'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()

2
lib/screens/gh_events.dart
View File

@ -17,7 +17,7 @@ class GhEventsScreen extends StatelessWidget {
return ListStatefulScaffold<GithubEvent, int>(
title: AppBarTitle('Events'),
itemBuilder: (payload) => EventItem(payload),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final events = await context.read<AuthModel>().ghClient.getJSON(
'/users/$login/events?page=$page&per_page=$pageSize',

2
lib/screens/gh_files.dart
View File

@ -26,7 +26,7 @@ class GhFilesScreen extends StatelessWidget {
],
);
},
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()

2
lib/screens/gh_gists.dart
View File

@ -15,7 +15,7 @@ class GhGistsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GithubGistsItem, int>(
title: AppBarTitle('Gists'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()

2
lib/screens/gh_gists_files.dart
View File

@ -16,7 +16,7 @@ class GhGistsFilesScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<GithubGistsItem>(
title: AppBarTitle('Files'),
fetchData: () async {
fetch: () async {
final data = await context.read<AuthModel>().ghClient.getJSON(
'/gists/$id',
convert: (vs) => GithubGistsItem.fromJson(vs));

2
lib/screens/gh_issues.dart
View File

@ -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<AuthModel>().gqlClient.execute(GhIssuesQuery(
variables: GhIssuesArguments(

2
lib/screens/gh_news.dart
View File

@ -37,7 +37,7 @@ class GhNewsScreenState extends State<GhNewsScreen> {
return ListStatefulScaffold<GithubEvent, int>(
title: AppBarTitle('News'),
itemBuilder: (payload) => EventItem(payload),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final login = auth.activeAccount.login;

2
lib/screens/gh_object.dart
View File

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

2
lib/screens/gh_org_repos.dart
View File

@ -20,7 +20,7 @@ class GhOrgReposScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<Repository, int>(
title: AppBarTitle('Repositories'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final rs = await context
.read<AuthModel>()

2
lib/screens/gh_orgs.dart
View File

@ -14,7 +14,7 @@ class GhUserOrganizationScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GithubUserOrganizationItem, int>(
title: AppBarTitle('Organizations'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()

2
lib/screens/gh_pulls.dart
View File

@ -16,7 +16,7 @@ class GhPullsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GhPullsPullRequest, String>(
title: AppBarTitle('Pull requests'),
onLoadMore: (cursor) async {
fetch: (cursor) async {
final res =
await context.read<AuthModel>().gqlClient.execute(GhPullsQuery(
variables: GhPullsArguments(

2
lib/screens/gh_repo.dart
View File

@ -43,7 +43,7 @@ class GhRepoScreen extends StatelessWidget {
final theme = Provider.of<ThemeModel>(context);
return RefreshStatefulScaffold<GhRepoRepository>(
title: AppBarTitle('Repository'),
fetchData: () async {
fetch: () async {
var res = await context.read<AuthModel>().gqlClient.execute(GhRepoQuery(
variables: GhRepoArguments(
owner: owner,

2
lib/screens/gh_repos.dart
View File

@ -23,7 +23,7 @@ class GhReposScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GhReposRepository, String>(
title: AppBarTitle(title),
onLoadMore: (cursor) async {
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final res = await auth.gqlClient.execute(GhReposQuery(
variables:

2
lib/screens/gh_user.dart
View File

@ -292,7 +292,7 @@ class GhUserScreen extends StatelessWidget {
Widget build(BuildContext context) {
final auth = Provider.of<AuthModel>(context);
return RefreshStatefulScaffold<GhUserRepositoryOwner>(
fetchData: () async {
fetch: () async {
final data = await auth.gqlClient.execute(GhUserQuery(
variables:
GhUserArguments(login: login ?? '', isViewer: isViewer)));

2
lib/screens/gh_users.dart
View File

@ -88,7 +88,7 @@ class GhUsersScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GhUsersUser, String>(
title: AppBarTitle(_title),
onLoadMore: (cursor) async {
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final res = await auth.gqlClient.execute(GhUsersQuery(
variables: GhUsersArguments(

2
lib/screens/gl_blob.dart
View File

@ -18,7 +18,7 @@ class GlBlobScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<GitlabBlob>(
title: AppBarTitle(path ?? ''),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await auth.fetchGitlab(
'/projects/$id/repository/files/${path.urlencode}?ref=$ref');

2
lib/screens/gl_commit.dart
View File

@ -30,7 +30,7 @@ class GlCommitScreen extends StatelessWidget {
return RefreshStatefulScaffold<List<GitlabDiff>>(
title: AppBarTitle('Commits'),
fetchData: () => _query(context),
fetch: () => _query(context),
bodyBuilder: (items, _) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,

2
lib/screens/gl_commits.dart
View File

@ -16,7 +16,7 @@ class GlCommitsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabCommit, int>(
title: AppBarTitle('Commits'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final res = await auth

2
lib/screens/gl_explore.dart
View File

@ -12,7 +12,7 @@ class GlExploreScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabProject, int>(
title: AppBarTitle('Explore'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final res = await auth.fetchGitlabWithPage(

2
lib/screens/gl_group.dart
View File

@ -19,7 +19,7 @@ class GlGroupScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<Tuple2<GitlabGroup, int>>(
title: Text('Group'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await Future.wait([
auth.fetchGitlab('/groups/$id'),

2
lib/screens/gl_groups.dart
View File

@ -11,7 +11,7 @@ class GlGroupsScreenn extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabGroup, int>(
title: AppBarTitle('Groups'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final res = await auth.fetchGitlabWithPage('/groups?page=$page');

2
lib/screens/gl_issue.dart
View File

@ -20,7 +20,7 @@ class GlIssueScreen extends StatelessWidget {
return RefreshStatefulScaffold<
Tuple3<GitlabTodoTarget, Iterable<GitlabIssueNote>, List>>(
title: Text('Issue #$iid'),
fetchData: () async {
fetch: () async {
final type = isMr ? 'merge_requests' : 'issues';
final auth = context.read<AuthModel>();
final items = await Future.wait([

2
lib/screens/gl_issues.dart
View File

@ -17,7 +17,7 @@ class GlIssuesScreen extends StatelessWidget {
return ListStatefulScaffold<GitlabIssue, int>(
title: AppBarTitle('Issues'),
// TODO: create issue
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final res = await auth.fetchGitlabWithPage(

2
lib/screens/gl_members.dart
View File

@ -24,7 +24,7 @@ class GlMembersScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabUser, int>(
title: AppBarTitle('Members'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final res =

2
lib/screens/gl_merge_requests.dart
View File

@ -16,7 +16,7 @@ class GlMergeRequestsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabIssue, int>(
title: AppBarTitle('Merge Requests'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context.read<AuthModel>().fetchGitlabWithPage(
'/projects/$id/merge_requests?state=opened&page=$page');

2
lib/screens/gl_project.dart
View File

@ -27,7 +27,7 @@ class GlProjectScreen extends StatelessWidget {
Tuple5<GitlabProject, Map<String, double>, List<GitlabProjectBadge>,
int, String>>(
title: AppBarTitle('Project'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await Future.wait([
auth.fetchGitlab('/projects/$id?statistics=1'),

2
lib/screens/gl_project_activity.dart
View File

@ -18,7 +18,7 @@ class GlProjectActivityScreen extends StatelessWidget {
final theme = Provider.of<ThemeModel>(context);
return ListStatefulScaffold<GitlabEvent, int>(
title: AppBarTitle('Activity'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();
final vs = await auth.fetchGitlab('/projects/$id/events');

2
lib/screens/gl_starrers.dart
View File

@ -15,7 +15,7 @@ class GlStarrersScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GitlabStarrer, int>(
title: AppBarTitle('Members'),
onLoadMore: (page) async {
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()

2
lib/screens/gl_todos.dart
View File

@ -63,7 +63,7 @@ class GlTodosScreen extends StatelessWidget {
return RefreshStatefulScaffold<Iterable<GitlabTodo>>(
title: Text('Todos'),
fetchData: () async {
fetch: () async {
final vs = await context.read<AuthModel>().fetchGitlab('/todos');
return (vs as List).map((v) => GitlabTodo.fromJson(v));
},

2
lib/screens/gl_tree.dart
View File

@ -19,7 +19,7 @@ class GlTreeScreen extends StatelessWidget {
final auth = Provider.of<AuthModel>(context);
return RefreshStatefulScaffold<Iterable<GitlabTreeItem>>(
title: AppBarTitle(path ?? 'Files'),
fetchData: () async {
fetch: () async {
final uri = Uri(
path: '/projects/$id/repository/tree',
queryParameters: {

2
lib/screens/gl_user.dart
View File

@ -20,7 +20,7 @@ class GlUserScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<Tuple2<GitlabUser, Iterable<GitlabProject>>>(
title: Text(isViewer ? 'Me' : 'User'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final _id = id ?? auth.activeAccount.gitlabId;
final res = await Future.wait([

2
lib/screens/gt_commits.dart
View File

@ -16,7 +16,7 @@ class GtCommitsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GiteaCommit, int>(
title: AppBarTitle('Commits'),
onLoadMore: (page) async {
fetch: (page) async {
final res = await context
.read<AuthModel>()
.fetchGiteaWithPage('/repos/$owner/$name/commits', page: page);

2
lib/screens/gt_issues.dart
View File

@ -17,7 +17,7 @@ class GtIssuesScreen extends StatelessWidget {
return ListStatefulScaffold<GiteaIssue, int>(
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<AuthModel>().fetchGiteaWithPage(
'/repos/$owner/$name/issues?state=open&type=$type',

2
lib/screens/gt_object.dart
View File

@ -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<AuthModel>()

2
lib/screens/gt_orgs.dart
View File

@ -15,7 +15,7 @@ class GtOrgsScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GiteaOrg, int>(
title: AppBarTitle('Organizations'),
onLoadMore: (page) async {
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);
return ListPayload(

2
lib/screens/gt_repo.dart
View File

@ -22,7 +22,7 @@ class GtRepoScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<Tuple2<GiteaRepository, String>>(
title: AppBarTitle('Repository'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await Future.wait([
auth.fetchGitea('/repos/$owner/$name'),

2
lib/screens/gt_repos.dart
View File

@ -28,7 +28,7 @@ class GtReposScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GiteaRepository, int>(
title: AppBarTitle(title),
onLoadMore: (page) async {
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);
return ListPayload(

2
lib/screens/gt_status.dart
View File

@ -11,7 +11,7 @@ class GtStatusScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<String>(
title: Text('Gitea status'),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await Future.wait([
auth.fetchGitea('/version'),

2
lib/screens/gt_user.dart
View File

@ -55,7 +55,7 @@ class GtUserScreen extends StatelessWidget {
Widget build(BuildContext context) {
return RefreshStatefulScaffold<GtUserScreenPayload>(
title: Text(isViewer ? 'Me' : login),
fetchData: () async {
fetch: () async {
final auth = context.read<AuthModel>();
final res = await Future.wait([
auth.fetchGitea('/orgs/$login'),

2
lib/screens/gt_users.dart
View File

@ -31,7 +31,7 @@ class GtUsersScreen extends StatelessWidget {
Widget build(BuildContext context) {
return ListStatefulScaffold<GiteaUser, int>(
title: AppBarTitle(title),
onLoadMore: (page) async {
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);
return ListPayload(