Compare commits
No commits in common. "dfd80021b9c99912e0549e179b6664490cd90305" and "0ed8c2373dd80009660654fdf5e7c2989a1aad51" have entirely different histories.
dfd80021b9
...
0ed8c2373d
@ -23,7 +23,6 @@
|
|||||||
"screenRealmManage": "Edit Realm",
|
"screenRealmManage": "Edit Realm",
|
||||||
"screenRealmNew": "New Realm",
|
"screenRealmNew": "New Realm",
|
||||||
"screenNotification": "Notification",
|
"screenNotification": "Notification",
|
||||||
"screenPostSearch": "Search Posts",
|
|
||||||
"dialogOkay": "Okay",
|
"dialogOkay": "Okay",
|
||||||
"dialogCancel": "Cancel",
|
"dialogCancel": "Cancel",
|
||||||
"dialogConfirm": "Confirm",
|
"dialogConfirm": "Confirm",
|
||||||
@ -196,11 +195,5 @@
|
|||||||
"one": "Marked {} notification as read.",
|
"one": "Marked {} notification as read.",
|
||||||
"other": "Marked {} notifications as read."
|
"other": "Marked {} notifications as read."
|
||||||
},
|
},
|
||||||
"notificationMarkOneReadPrompt": "Marked notification {} as read.",
|
"notificationMarkOneReadPrompt": "Marked notification {} as read."
|
||||||
"postSearchResult": {
|
|
||||||
"zero": "No results",
|
|
||||||
"one": "{} result",
|
|
||||||
"other": "{} results"
|
|
||||||
},
|
|
||||||
"postSearchTook": "Took {}"
|
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
"screenRealmManage": "编辑领域",
|
"screenRealmManage": "编辑领域",
|
||||||
"screenRealmNew": "新建领域",
|
"screenRealmNew": "新建领域",
|
||||||
"screenNotification": "通知",
|
"screenNotification": "通知",
|
||||||
"screenPostSearch": "搜索帖子",
|
|
||||||
"dialogOkay": "好的",
|
"dialogOkay": "好的",
|
||||||
"dialogCancel": "取消",
|
"dialogCancel": "取消",
|
||||||
"dialogConfirm": "确认",
|
"dialogConfirm": "确认",
|
||||||
@ -196,11 +195,5 @@
|
|||||||
"one": "已将 {} 个通知标记为已读。",
|
"one": "已将 {} 个通知标记为已读。",
|
||||||
"other": "已将 {} 个通知标记为已读。"
|
"other": "已将 {} 个通知标记为已读。"
|
||||||
},
|
},
|
||||||
"notificationMarkOneReadPrompt": "已将通知 {} 标记为已读。",
|
"notificationMarkOneReadPrompt": "已将通知 {} 标记为已读。"
|
||||||
"postSearchResult": {
|
|
||||||
"zero": "没有搜索到结果",
|
|
||||||
"one": "搜索到 {} 个结果",
|
|
||||||
"other": "搜索到 {} 个结果"
|
|
||||||
},
|
|
||||||
"postSearchTook": "耗时 {}"
|
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,6 @@ void main() async {
|
|||||||
'https://c218d44126d59d69301e730498494def@o4506965897117696.ingest.us.sentry.io/4508346768228352';
|
'https://c218d44126d59d69301e730498494def@o4506965897117696.ingest.us.sentry.io/4508346768228352';
|
||||||
options.tracesSampleRate = 1.0;
|
options.tracesSampleRate = 1.0;
|
||||||
options.profilesSampleRate = 1.0;
|
options.profilesSampleRate = 1.0;
|
||||||
options.experimental.replay.sessionSampleRate = 1.0;
|
|
||||||
options.experimental.replay.onErrorSampleRate = 1.0;
|
|
||||||
},
|
},
|
||||||
appRunner: () => runApp(const SolianApp()),
|
appRunner: () => runApp(const SolianApp()),
|
||||||
);
|
);
|
||||||
|
@ -17,7 +17,6 @@ import 'package:surface/screens/home.dart';
|
|||||||
import 'package:surface/screens/notification.dart';
|
import 'package:surface/screens/notification.dart';
|
||||||
import 'package:surface/screens/post/post_detail.dart';
|
import 'package:surface/screens/post/post_detail.dart';
|
||||||
import 'package:surface/screens/post/post_editor.dart';
|
import 'package:surface/screens/post/post_editor.dart';
|
||||||
import 'package:surface/screens/post/post_search.dart';
|
|
||||||
import 'package:surface/screens/realm.dart';
|
import 'package:surface/screens/realm.dart';
|
||||||
import 'package:surface/screens/realm/manage.dart';
|
import 'package:surface/screens/realm/manage.dart';
|
||||||
import 'package:surface/screens/settings.dart';
|
import 'package:surface/screens/settings.dart';
|
||||||
@ -65,17 +64,11 @@ final _appRoutes = [
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
GoRoute(
|
|
||||||
path: '/post/search',
|
|
||||||
name: 'postSearch',
|
|
||||||
builder: (context, state) => const AppBackground(
|
|
||||||
child: PostSearchScreen(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/post/:slug',
|
path: '/post/:slug',
|
||||||
name: 'postDetail',
|
name: 'postDetail',
|
||||||
builder: (context, state) => AppBackground(
|
builder: (context, state) => AppBackground(
|
||||||
|
isLessOptimization: true,
|
||||||
child: PostDetailScreen(
|
child: PostDetailScreen(
|
||||||
slug: state.pathParameters['slug']!,
|
slug: state.pathParameters['slug']!,
|
||||||
preload: state.extra as SnPost?,
|
preload: state.extra as SnPost?,
|
||||||
|
@ -164,14 +164,6 @@ class _ExploreScreenState extends State<ExploreScreen> {
|
|||||||
title: Text('screenExplore').tr(),
|
title: Text('screenExplore').tr(),
|
||||||
floating: true,
|
floating: true,
|
||||||
snap: true,
|
snap: true,
|
||||||
actions: [
|
|
||||||
IconButton(
|
|
||||||
icon: const Icon(Symbols.search),
|
|
||||||
onPressed: () {
|
|
||||||
GoRouter.of(context).pushNamed('postSearch');
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
SliverInfiniteList(
|
SliverInfiniteList(
|
||||||
itemCount: _posts.length,
|
itemCount: _posts.length,
|
||||||
|
@ -80,8 +80,7 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
|
|||||||
leading: BackButton(
|
leading: BackButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (GoRouter.of(context).canPop()) {
|
if (GoRouter.of(context).canPop()) {
|
||||||
GoRouter.of(context).pop(context);
|
Navigator.pop(context);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
GoRouter.of(context).replaceNamed('explore');
|
GoRouter.of(context).replaceNamed('explore');
|
||||||
},
|
},
|
||||||
|
@ -1,189 +0,0 @@
|
|||||||
import 'package:easy_localization/easy_localization.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:gap/gap.dart';
|
|
||||||
import 'package:go_router/go_router.dart';
|
|
||||||
import 'package:material_symbols_icons/symbols.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
import 'package:styled_widget/styled_widget.dart';
|
|
||||||
import 'package:surface/providers/sn_attachment.dart';
|
|
||||||
import 'package:surface/providers/sn_network.dart';
|
|
||||||
import 'package:surface/types/post.dart';
|
|
||||||
import 'package:surface/widgets/post/post_item.dart';
|
|
||||||
import 'package:very_good_infinite_list/very_good_infinite_list.dart';
|
|
||||||
|
|
||||||
class PostSearchScreen extends StatefulWidget {
|
|
||||||
const PostSearchScreen({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<PostSearchScreen> createState() => _PostSearchScreenState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _PostSearchScreenState extends State<PostSearchScreen> {
|
|
||||||
bool _isBusy = false;
|
|
||||||
|
|
||||||
final List<SnPost> _posts = List.empty(growable: true);
|
|
||||||
int? _postCount;
|
|
||||||
|
|
||||||
String _searchTerm = '';
|
|
||||||
Duration? _lastTook;
|
|
||||||
|
|
||||||
Future<void> _fetchPosts() async {
|
|
||||||
if (_searchTerm.isEmpty) return;
|
|
||||||
if (_postCount != null && _posts.length >= _postCount!) return;
|
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
|
||||||
|
|
||||||
final stopwatch = Stopwatch()..start();
|
|
||||||
|
|
||||||
final sn = context.read<SnNetworkProvider>();
|
|
||||||
final resp = await sn.client.get('/cgi/co/posts/search', queryParameters: {
|
|
||||||
'take': 10,
|
|
||||||
'offset': _posts.length,
|
|
||||||
'probe': _searchTerm,
|
|
||||||
});
|
|
||||||
final List<SnPost> out =
|
|
||||||
List.from(resp.data['data']?.map((e) => SnPost.fromJson(e)) ?? []);
|
|
||||||
|
|
||||||
Set<String> rids = {};
|
|
||||||
for (var i = 0; i < out.length; i++) {
|
|
||||||
rids.addAll(out[i].body['attachments']?.cast<String>() ?? []);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!mounted) return;
|
|
||||||
final attach = context.read<SnAttachmentProvider>();
|
|
||||||
final attachments = await attach.getMultiple(rids.toList());
|
|
||||||
for (var i = 0; i < out.length; i++) {
|
|
||||||
out[i] = out[i].copyWith(
|
|
||||||
preload: SnPostPreload(
|
|
||||||
attachments: attachments
|
|
||||||
.where(
|
|
||||||
(ele) =>
|
|
||||||
out[i].body['attachments']?.contains(ele?.rid) ?? false,
|
|
||||||
)
|
|
||||||
.toList(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
stopwatch.stop();
|
|
||||||
|
|
||||||
_lastTook = stopwatch.elapsed;
|
|
||||||
_postCount = resp.data['count'];
|
|
||||||
_posts.addAll(out);
|
|
||||||
|
|
||||||
if (mounted) setState(() => _isBusy = false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
const labelShadows = <Shadow>[
|
|
||||||
Shadow(
|
|
||||||
offset: Offset(1, 1),
|
|
||||||
blurRadius: 8.0,
|
|
||||||
color: Color.fromARGB(255, 0, 0, 0),
|
|
||||||
),
|
|
||||||
];
|
|
||||||
|
|
||||||
return Scaffold(
|
|
||||||
appBar: AppBar(
|
|
||||||
title: Text('screenPostSearch').tr(),
|
|
||||||
),
|
|
||||||
body: Stack(
|
|
||||||
children: [
|
|
||||||
InfiniteList(
|
|
||||||
padding: const EdgeInsets.only(top: 96),
|
|
||||||
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) {
|
|
||||||
setState(() => _posts[idx] = data);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
onTap: () {
|
|
||||||
GoRouter.of(context).pushNamed(
|
|
||||||
'postDetail',
|
|
||||||
pathParameters: {'slug': _posts[idx].id.toString()},
|
|
||||||
extra: _posts[idx],
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
separatorBuilder: (context, index) => const Divider(height: 1),
|
|
||||||
),
|
|
||||||
Positioned(
|
|
||||||
top: 16,
|
|
||||||
left: 16,
|
|
||||||
right: 16,
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
SearchBar(
|
|
||||||
elevation: const WidgetStatePropertyAll(1),
|
|
||||||
leading: const Icon(Symbols.search),
|
|
||||||
padding: const WidgetStatePropertyAll(
|
|
||||||
EdgeInsets.symmetric(horizontal: 24),
|
|
||||||
),
|
|
||||||
onChanged: (value) {
|
|
||||||
_searchTerm = value;
|
|
||||||
},
|
|
||||||
onSubmitted: (value) {
|
|
||||||
setState(() => _posts.clear());
|
|
||||||
|
|
||||||
_searchTerm = value;
|
|
||||||
_fetchPosts();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
if (_lastTook != null)
|
|
||||||
Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
children: [
|
|
||||||
Icon(
|
|
||||||
Symbols.summarize,
|
|
||||||
color: Colors.white,
|
|
||||||
shadows: labelShadows,
|
|
||||||
size: 16,
|
|
||||||
),
|
|
||||||
const Gap(4),
|
|
||||||
Text(
|
|
||||||
'postSearchResult'.plural(_postCount ?? 0),
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
shadows: labelShadows,
|
|
||||||
fontSize: 13,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Gap(8),
|
|
||||||
Icon(
|
|
||||||
Symbols.pace,
|
|
||||||
color: Colors.white,
|
|
||||||
shadows: labelShadows,
|
|
||||||
size: 16,
|
|
||||||
),
|
|
||||||
const Gap(4),
|
|
||||||
Text(
|
|
||||||
'postSearchTook'.tr(args: [
|
|
||||||
'${(_lastTook!.inMilliseconds / 1000).toStringAsFixed(3)}s',
|
|
||||||
]),
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
shadows: labelShadows,
|
|
||||||
fontSize: 13,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
).padding(vertical: 8),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user