HyperNet/Surface
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Better categorized fetching in publisher page

Browse Source
This commit is contained in:
LittleSheep 2024-12-01 23:20:05 +08:00
parent 177ff513ee
commit 9588fc0475
2 changed files with 286 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/providers/post.dart
View File

@ -66,11 +66,13 @@ class SnPostContentProvider {
Future<(List<SnPost>, int)> listPosts({ Future<(List<SnPost>, int)> listPosts({
int take = 10, int take = 10,
int offset = 0, int offset = 0,
String? type,
String? author, String? author,
}) async { }) async {
final resp = await _sn.client.get('/cgi/co/posts', queryParameters: { final resp = await _sn.client.get('/cgi/co/posts', queryParameters: {
'take': take, 'take': take,
'offset': offset, 'offset': offset,
if (type != null) 'type': type,
if (author != null) 'author': author, if (author != null) 'author': author,
}); });
final List<SnPost> out = await _preloadRelatedDataInBatch( final List<SnPost> out = await _preloadRelatedDataInBatch(

591
lib/screens/post/post_publisher.dart
View File

@ -1,5 +1,3 @@
import 'dart:convert';
import 'dart:developer';
import 'dart:ui'; import 'dart:ui';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -29,8 +27,11 @@ class PostPublisherScreen extends StatefulWidget {
State<PostPublisherScreen> createState() => _PostPublisherScreenState(); State<PostPublisherScreen> createState() => _PostPublisherScreenState();
} }
class _PostPublisherScreenState extends State<PostPublisherScreen> { class _PostPublisherScreenState extends State<PostPublisherScreen>
with SingleTickerProviderStateMixin {
late final ScrollController _scrollController = ScrollController(); late final ScrollController _scrollController = ScrollController();
late final TabController _tabController =
TabController(length: 3, vsync: this);
SnPublisher? _publisher; SnPublisher? _publisher;
SnAccount? _account; SnAccount? _account;
@ -66,9 +67,8 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> {
); );
if (!mounted) return; if (!mounted) return;
_subscription = SnSubscription.fromJson(resp.data); _subscription = SnSubscription.fromJson(resp.data);
} catch (err) { } catch (_) {
if (!mounted) return; // ignore due to maybe 404
context.showErrorDialog(err);
} finally { } finally {
setState(() => _isSubscribing = false); setState(() => _isSubscribing = false);
} }
@ -131,12 +131,19 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> {
Future<void> _fetchPosts() async { Future<void> _fetchPosts() async {
if (_isBusy) return; if (_isBusy) return;
_isBusy = true;
setState(() => _isBusy = true);
try { try {
final pt = context.read<SnPostContentProvider>(); final pt = context.read<SnPostContentProvider>();
final result = await pt.listPosts( final result = await pt.listPosts(
offset: _posts.length, offset: _posts.length,
author: widget.name, author: widget.name,
type: switch (_tabController.index) {
1 => 'story',
2 => 'article',
_ => null,
},
); );
_postCount = result.$2; _postCount = result.$2;
_posts.addAll(result.$1); _posts.addAll(result.$1);
@ -144,11 +151,15 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> {
if (!mounted) return; if (!mounted) return;
context.showErrorDialog(err); context.showErrorDialog(err);
} finally { } finally {
_isBusy = false; setState(() => _isBusy = false);
setState(() {});
} }
} }
void _updateFetchType() {
_posts.clear();
_fetchPosts();
}
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -157,12 +168,15 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> {
_fetchSubscription(); _fetchSubscription();
}); });
_scrollController.addListener(_updateAppBarBlur); _scrollController.addListener(_updateAppBarBlur);
_tabController.addListener(_updateFetchType);
} }
@override @override
void dispose() { void dispose() {
_scrollController.removeListener(_updateAppBarBlur); _scrollController.removeListener(_updateAppBarBlur);
_scrollController.dispose(); _scrollController.dispose();
_tabController.removeListener(_updateFetchType);
_tabController.dispose();
super.dispose(); super.dispose();
} }
@ -182,317 +196,280 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> {
final sn = context.read<SnNetworkProvider>(); final sn = context.read<SnNetworkProvider>();
// TODO fix loading on different type return Scaffold(
return DefaultTabController( body: NestedScrollView(
length: 3, controller: _scrollController,
child: Scaffold( headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
body: NestedScrollView( return <Widget>[
controller: _scrollController, SliverOverlapAbsorber(
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) { handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
return <Widget>[ sliver: MultiSliver(
SliverOverlapAbsorber( children: [
handle: SliverAppBar(
NestedScrollView.sliverOverlapAbsorberHandleFor(context), expandedHeight: _appBarHeight,
sliver: MultiSliver( title: _publisher == null
children: [ ? Text('loading').tr()
SliverAppBar( : RichText(
expandedHeight: _appBarHeight, textAlign: TextAlign.center,
title: _publisher == null text: TextSpan(children: [
? Text('loading').tr() TextSpan(
: RichText( text: _publisher!.nick,
textAlign: TextAlign.center, style: Theme.of(context)
text: TextSpan(children: [ .textTheme
TextSpan( .titleLarge!
text: _publisher!.nick, .copyWith(
style: Theme.of(context) color: Colors.white,
.textTheme shadows: labelShadows,
.titleLarge! ),
.copyWith( ),
color: Colors.white, const TextSpan(text: '\n'),
shadows: labelShadows, TextSpan(
), text: '@${_publisher!.name}',
), style: Theme.of(context)
const TextSpan(text: '\n'), .textTheme
TextSpan( .bodySmall!
text: '@${_publisher!.name}', .copyWith(
style: Theme.of(context) color: Colors.white,
.textTheme shadows: labelShadows,
.bodySmall! ),
.copyWith( ),
color: Colors.white, ]),
shadows: labelShadows, ),
), pinned: true,
), flexibleSpace: _publisher != null
]), ? Stack(
), fit: StackFit.expand,
pinned: true, children: [
flexibleSpace: _publisher != null UniversalImage(
? Stack( sn.getAttachmentUrl(_publisher!.banner),
fit: StackFit.expand, fit: BoxFit.cover,
children: [ height: imageHeight,
UniversalImage( width: _appBarWidth,
sn.getAttachmentUrl(_publisher!.banner), cacheHeight: imageHeight,
fit: BoxFit.cover, cacheWidth: _appBarWidth,
height: imageHeight, ),
width: _appBarWidth, Positioned(
cacheHeight: imageHeight, top: 0,
cacheWidth: _appBarWidth, left: 0,
), right: 0,
Positioned( height: 56 + MediaQuery.of(context).padding.top,
top: 0, child: ClipRect(
left: 0, child: BackdropFilter(
right: 0, filter: ImageFilter.blur(
height: sigmaX: _appBarBlur,
56 + MediaQuery.of(context).padding.top, sigmaY: _appBarBlur,
child: ClipRect( ),
child: BackdropFilter( child: Container(
filter: ImageFilter.blur( color: Colors.black.withOpacity(
sigmaX: _appBarBlur, clampDouble(_appBarBlur * 0.1, 0, 0.5),
sigmaY: _appBarBlur,
),
child: Container(
color: Colors.black.withOpacity(
clampDouble(
_appBarBlur * 0.1, 0, 0.5),
),
), ),
), ),
), ),
), ),
),
],
)
: null,
),
if (_publisher != null)
SliverToBoxAdapter(
child: Container(
constraints: const BoxConstraints(maxWidth: 640),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
AccountImage(
content: _publisher!.avatar,
radius: 28,
),
const Gap(16),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
_publisher!.nick,
style: Theme.of(context)
.textTheme
.titleMedium,
).bold(),
Text('@${_publisher!.name}').fontSize(13),
],
),
),
if (_subscription == null)
ElevatedButton.icon(
style: ButtonStyle(
elevation: WidgetStatePropertyAll(0),
),
onPressed: _isSubscribing
? null
: _toggleSubscription,
label: Text('subscribe').tr(),
icon: const Icon(Symbols.add),
)
else
OutlinedButton.icon(
style: ButtonStyle(
elevation: WidgetStatePropertyAll(0),
),
onPressed: _isSubscribing
? null
: _toggleSubscription,
label: Text('unsubscribe').tr(),
icon: const Icon(Symbols.remove),
),
],
).padding(right: 8),
const Gap(12),
Text(_publisher!.description)
.padding(horizontal: 8),
const Gap(12),
Column(
children: [
Row(
children: [
const Icon(Symbols.calendar_add_on),
const Gap(8),
Text('publisherJoinedAt').tr(args: [
DateFormat('y/M/d')
.format(_publisher!.createdAt)
]),
],
),
Row(
children: [
const Icon(Symbols.trending_up),
const Gap(8),
Text('publisherSocialPointTotal').plural(
_publisher!.totalUpvote -
_publisher!.totalDownvote,
),
],
),
Row(
children: [
const Icon(Symbols.tools_wrench),
const Gap(8),
InkWell(
child: Text('publisherRunBy').tr(args: [
'@${_account?.name ?? 'unknown'}',
]),
onTap: () {},
),
const Gap(8),
AccountImage(
content: _account?.avatar, radius: 8),
],
),
], ],
) ).padding(horizontal: 8),
: null, ],
).padding(all: 16),
).center(),
), ),
if (_publisher != null) SliverToBoxAdapter(child: const Divider(height: 1)),
SliverToBoxAdapter( TabBar(
child: Container( controller: _tabController,
constraints: const BoxConstraints(maxWidth: 640), tabs: [
child: Column( Tab(
crossAxisAlignment: CrossAxisAlignment.start, icon: Icon(
children: [ Symbols.pages,
Row( color: Theme.of(context).colorScheme.onSurface,
children: [ ),
AccountImage(
content: _publisher!.avatar,
radius: 28,
),
const Gap(16),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
_publisher!.nick,
style: Theme.of(context)
.textTheme
.titleMedium,
).bold(),
Text('@${_publisher!.name}')
.fontSize(13),
],
),
),
if (_subscription == null)
ElevatedButton.icon(
style: ButtonStyle(
elevation: WidgetStatePropertyAll(0),
),
onPressed: _isSubscribing
? null
: _toggleSubscription,
label: Text('subscribe').tr(),
icon: const Icon(Symbols.add),
)
else
OutlinedButton.icon(
style: ButtonStyle(
elevation: WidgetStatePropertyAll(0),
),
onPressed: _isSubscribing
? null
: _toggleSubscription,
label: Text('unsubscribe').tr(),
icon: const Icon(Symbols.remove),
),
],
).padding(right: 8),
const Gap(12),
Text(_publisher!.description)
.padding(horizontal: 8),
const Gap(12),
Column(
children: [
Row(
children: [
const Icon(Symbols.calendar_add_on),
const Gap(8),
Text('publisherJoinedAt').tr(args: [
DateFormat('y/M/d')
.format(_publisher!.createdAt)
]),
],
),
Row(
children: [
const Icon(Symbols.trending_up),
const Gap(8),
Text('publisherSocialPointTotal').plural(
_publisher!.totalUpvote -
_publisher!.totalDownvote,
),
],
),
Row(
children: [
const Icon(Symbols.tools_wrench),
const Gap(8),
InkWell(
child: Text('publisherRunBy').tr(args: [
'@${_account?.name ?? 'unknown'}',
]),
onTap: () {},
),
const Gap(8),
AccountImage(
content: _account?.avatar, radius: 8),
],
),
],
).padding(horizontal: 8),
],
).padding(all: 16),
).center(),
), ),
SliverToBoxAdapter(child: const Divider(height: 1)), Tab(
TabBar( icon: Icon(
tabs: [ Symbols.sticky_note_2,
Tab( color: Theme.of(context).colorScheme.onSurface,
icon: Icon(
Symbols.pages,
color: Theme.of(context).colorScheme.onSurface,
),
), ),
Tab( ),
icon: Icon( Tab(
Symbols.sticky_note_2, icon: Icon(
color: Theme.of(context).colorScheme.onSurface, Symbols.article,
), color: Theme.of(context).colorScheme.onSurface,
), ),
Tab( ),
icon: Icon( ],
Symbols.article, ),
color: Theme.of(context).colorScheme.onSurface, SliverToBoxAdapter(child: const Divider(height: 1)),
), Gap(MediaQuery.of(context).padding.top),
), ],
],
),
SliverToBoxAdapter(child: const Divider(height: 1)),
Gap(MediaQuery.of(context).padding.top),
],
),
), ),
]; ),
}, ];
body: TabBarView( },
children: [ body: TabBarView(
InfiniteList( controller: _tabController,
itemCount: _posts.length, children: List.filled(
isLoading: _isBusy, 3,
hasReachedMax: _PublisherPostList(
_postCount != null && _posts.length >= _postCount!, isBusy: _isBusy,
onFetchData: _fetchPosts, postCount: _postCount,
itemBuilder: (context, idx) { posts: _posts,
return GestureDetector( fetchPosts: _fetchPosts,
child: PostItem( onChanged: (idx, data) {
data: _posts[idx], setState(() => _posts[idx] = data);
maxWidth: 640, },
onChanged: (data) { onDeleted: () {
setState(() => _posts[idx] = data); _posts.clear();
}, _fetchPosts();
onDeleted: () { },
_posts.clear(); ),
_fetchPosts();
},
),
onTap: () {
GoRouter.of(context).pushNamed(
'postDetail',
pathParameters: {'slug': _posts[idx].id.toString()},
extra: _posts[idx],
);
},
);
},
separatorBuilder: (context, index) => const Divider(height: 1),
),
InfiniteList(
itemCount: _posts.where((e) => e.type == 'story').length,
isLoading: _isBusy,
hasReachedMax:
_postCount != null && _posts.length >= _postCount!,
onFetchData: _fetchPosts,
itemBuilder: (context, idx) {
return GestureDetector(
child: PostItem(
data:
_posts.where((e) => e.type == 'story').elementAt(idx),
maxWidth: 640,
onChanged: (data) {
setState(() => _posts[idx] = data);
},
onDeleted: () {
_posts.clear();
_fetchPosts();
},
),
onTap: () {
GoRouter.of(context).pushNamed(
'postDetail',
pathParameters: {'slug': _posts[idx].id.toString()},
extra: _posts[idx],
);
},
);
},
separatorBuilder: (context, index) => const Divider(height: 1),
),
InfiniteList(
itemCount: _posts.where((e) => e.type == 'article').length,
isLoading: _isBusy,
hasReachedMax:
_postCount != null && _posts.length >= _postCount!,
onFetchData: _fetchPosts,
itemBuilder: (context, idx) {
return GestureDetector(
child: PostItem(
data: _posts
.where((e) => e.type == 'article')
.elementAt(idx),
maxWidth: 640,
onChanged: (data) {
setState(() => _posts[idx] = data);
},
onDeleted: () {
_posts.clear();
_fetchPosts();
},
),
onTap: () {
GoRouter.of(context).pushNamed(
'postDetail',
pathParameters: {'slug': _posts[idx].id.toString()},
extra: _posts[idx],
);
},
);
},
separatorBuilder: (context, index) => const Divider(height: 1),
),
],
), ),
), ),
), ),
); );
} }
} }
class _PublisherPostList extends StatelessWidget {
final bool isBusy;
final int? postCount;
final List<SnPost> posts;
final void Function() fetchPosts;
final void Function(int index, SnPost data) onChanged;
final void Function() onDeleted;
const _PublisherPostList({
super.key,
required this.isBusy,
required this.postCount,
required this.posts,
required this.fetchPosts,
required this.onChanged,
required this.onDeleted,
});
@override
Widget build(BuildContext context) {
return InfiniteList(
itemCount: posts.length,
isLoading: isBusy,
hasReachedMax: postCount != null && posts.length >= postCount!,
onFetchData: fetchPosts,
itemBuilder: (context, idx) {
return GestureDetector(
child: PostItem(
data: posts[idx],
maxWidth: 640,
onChanged: (data) {
onChanged(idx, data);
},
onDeleted: onDeleted,
),
onTap: () {
GoRouter.of(context).pushNamed(
'postDetail',
pathParameters: {'slug': posts[idx].id.toString()},
extra: posts[idx],
);
},
);
},
separatorBuilder: (context, index) => const Divider(height: 1),
);
}
}