Skip to content

Commit 97bd998

Browse files
committed
fix: types
1 parent 242dd12 commit 97bd998

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

lib/scaffolds/long_list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import '../widgets/error_reload.dart';
1111
class LongListPayload<T, K> {
1212
T header;
1313
int totalCount;
14-
String cursor;
14+
String? cursor;
1515
List<K> leadingItems;
1616
List<K>? trailingItems;
1717

lib/screens/bb_issue.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,21 @@ class BbIssueScreen extends StatelessWidget {
2222

2323
@override
2424
Widget build(BuildContext context) {
25-
return RefreshStatefulScaffold<Tuple2<BbIssues, List<BbComment>>>(
25+
return RefreshStatefulScaffold<Tuple2<BbIssues, Iterable<BbComment>>>(
2626
title: Text("Issue: #$number"),
2727
fetch: () async {
2828
final auth = context.read<AuthModel>();
29-
final items = await Future.wait([
30-
auth.fetchBbJson('/repositories/$owner/$name/issues/$number'),
31-
auth.fetchBbWithPage(
32-
'/repositories/$owner/$name/issues/$number/comments')
29+
final res = await Future.wait([
30+
auth
31+
.fetchBbJson('/repositories/$owner/$name/issues/$number')
32+
.then((value) => BbIssues.fromJson(value)),
33+
auth
34+
.fetchBbWithPage(
35+
'/repositories/$owner/$name/issues/$number/comments')
36+
.then(
37+
(value) => [for (var v in value.items) BbComment.fromJson(v)])
3338
]);
34-
return Tuple2(BbIssues.fromJson(items[0]),
35-
[for (var v in items[1].data) BbComment.fromJson(v)]);
39+
return Tuple2(res[0] as BbIssues, res[1] as Iterable<BbComment>);
3640
},
3741
actionBuilder: (data, _) => ActionEntry(
3842
iconData: Octicons.plus,

lib/screens/bb_user.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ class BbUserScreen extends StatelessWidget {
2929
: 'User'),
3030
fetch: () async {
3131
final res = await Future.wait([
32-
auth.fetchBbJson('/${isTeam ? 'teams' : 'users'}/$_accountId'),
33-
auth.fetchBbWithPage('/repositories/$_login'),
32+
auth
33+
.fetchBbJson('/${isTeam ? 'teams' : 'users'}/$_accountId')
34+
.then((value) => BbUser.fromJson(value)),
35+
auth
36+
.fetchBbWithPage('/repositories/$_login')
37+
.then((value) => [for (var v in value.items) BbRepo.fromJson(v)]),
3438
]);
35-
return Tuple2(
36-
BbUser.fromJson(res[0]),
37-
[for (var v in res[1].data) BbRepo.fromJson(v)],
38-
);
39+
return Tuple2(res[0] as BbUser, res[1] as Iterable<BbRepo>);
3940
},
4041
action: isViewer
4142
? ActionEntry(

lib/screens/gh_issue.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class GhIssueScreen extends StatelessWidget {
264264
return LongListPayload(
265265
header: res,
266266
totalCount: issue.timelineItems.totalCount,
267-
cursor: issue.timelineItems.pageInfo.endCursor!,
267+
cursor: issue.timelineItems.pageInfo.endCursor,
268268
leadingItems: issue.timelineItems.nodes!.toList(),
269269
trailingItems: [],
270270
);
@@ -274,7 +274,7 @@ class GhIssueScreen extends StatelessWidget {
274274
return LongListPayload(
275275
header: res,
276276
totalCount: pr.timelineItems.totalCount,
277-
cursor: pr.timelineItems.pageInfo.endCursor!,
277+
cursor: pr.timelineItems.pageInfo.endCursor,
278278
leadingItems: pr.timelineItems.nodes!.toList(),
279279
trailingItems: [],
280280
);
@@ -288,7 +288,7 @@ class GhIssueScreen extends StatelessWidget {
288288
return LongListPayload(
289289
header: res,
290290
totalCount: issue.timelineItems.totalCount,
291-
cursor: issue.timelineItems.pageInfo.endCursor!,
291+
cursor: issue.timelineItems.pageInfo.endCursor,
292292
leadingItems: issue.timelineItems.nodes!.toList(),
293293
);
294294
} else {
@@ -297,7 +297,7 @@ class GhIssueScreen extends StatelessWidget {
297297
return LongListPayload(
298298
header: res,
299299
totalCount: pr.timelineItems.totalCount,
300-
cursor: pr.timelineItems.pageInfo.endCursor!,
300+
cursor: pr.timelineItems.pageInfo.endCursor,
301301
leadingItems: pr.timelineItems.nodes!.toList(),
302302
);
303303
}

lib/screens/go_user.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ class GoUserScreen extends StatelessWidget {
3030
limit: 6),
3131
]);
3232

33-
return Tuple2(GogsUser.fromJson(res[0]),
34-
[for (var repo in res[1].data) GogsRepository.fromJson(repo)]);
33+
return Tuple2(GogsUser.fromJson(res[0]), [
34+
for (var repo in (res[1] as DataWithPage).data)
35+
GogsRepository.fromJson(repo)
36+
]);
3537
},
3638
action: isViewer
3739
? ActionEntry(

0 commit comments

Comments
 (0)