Compare commits

...

2 Commits

Author SHA1 Message Date
fa3ba0e188 Shuffle mode 2024-07-25 02:00:29 +08:00
02c28533db 💄 Optimized post create popup 2024-07-25 01:43:50 +08:00
5 changed files with 140 additions and 66 deletions

View File

@ -9,7 +9,7 @@ class PostProvider extends GetConnect {
}
Future<Response> listRecommendations(int page,
{int? realm, String? tag, category}) async {
{int? realm, String? tag, category, String? channel}) async {
final queries = [
'take=${10}',
'offset=$page',
@ -17,7 +17,11 @@ class PostProvider extends GetConnect {
if (category != null) 'category=$category',
if (realm != null) 'realmId=$realm',
];
final resp = await get('/recommendations?${queries.join('&')}');
final resp = await get(
channel == null
? '/recommendations?${queries.join('&')}'
: '/recommendations/$channel?${queries.join('&')}',
);
if (resp.statusCode != 200) {
throw Exception(resp.body);
}
@ -34,7 +38,7 @@ class PostProvider extends GetConnect {
'offset=$page',
];
final client = auth.configureClient('interactive');
final resp = await client.get('/drafts?${queries.join('&')}');
final resp = await client.get('/posts/drafts?${queries.join('&')}');
if (resp.statusCode != 200) {
throw Exception(resp.body);
}

View File

@ -4,7 +4,6 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
import 'package:solian/models/pagination.dart';
import 'package:solian/models/post.dart';
import 'package:solian/providers/content/posts.dart';
import 'package:solian/screens/home.dart';
import 'package:solian/theme.dart';
import 'package:solian/widgets/app_bar_leading.dart';
import 'package:solian/widgets/app_bar_title.dart';
@ -64,10 +63,6 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
centerTitle: false,
toolbarHeight: SolianTheme.toolbarHeight(context),
actions: [
FeedCreationButton(
hideDraftBox: true,
onCreated: () {},
),
SizedBox(
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
),

View File

@ -20,16 +20,24 @@ class HomeScreen extends StatefulWidget {
State<HomeScreen> createState() => _HomeScreenState();
}
class _HomeScreenState extends State<HomeScreen> {
class _HomeScreenState extends State<HomeScreen>
with SingleTickerProviderStateMixin {
final PagingController<int, Post> _pagingController =
PagingController(firstPageKey: 0);
late final TabController _tabController;
int mode = 0;
getPosts(int pageKey) async {
final PostProvider provider = Get.find();
Response resp;
try {
resp = await provider.listRecommendations(pageKey);
resp = await provider.listRecommendations(
pageKey,
channel: mode == 0 ? null : 'shuffle',
);
} catch (e) {
_pagingController.error = e;
return;
@ -48,38 +56,74 @@ class _HomeScreenState extends State<HomeScreen> {
void initState() {
super.initState();
_pagingController.addPageRequestListener(getPosts);
_tabController = TabController(length: 2, vsync: this);
_tabController.addListener(() {
switch (_tabController.index) {
case 0:
case 1:
if (mode == _tabController.index) break;
mode = _tabController.index;
_pagingController.refresh();
}
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: Material(
color: Theme.of(context).colorScheme.surface,
child: RefreshIndicator(
return Material(
color: Theme.of(context).colorScheme.surface,
child: Scaffold(
floatingActionButton: FloatingActionButton(
child: const Icon(Icons.add),
onPressed: () {
showModalBottomSheet(
useRootNavigator: true,
isScrollControlled: true,
context: context,
builder: (context) => const PostCreatePopup(),
);
},
),
body: RefreshIndicator(
onRefresh: () => Future.sync(() => _pagingController.refresh()),
child: CustomScrollView(
slivers: [
SliverAppBar(
title: AppBarTitle('home'.tr),
centerTitle: false,
floating: true,
toolbarHeight: SolianTheme.toolbarHeight(context),
leading: AppBarLeadingButton.adaptive(context),
actions: [
const BackgroundStateWidget(),
const NotificationButton(),
FeedCreationButton(
onCreated: () {
_pagingController.refresh();
},
child: NestedScrollView(
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
return [
SliverAppBar(
title: AppBarTitle('home'.tr),
centerTitle: false,
floating: true,
toolbarHeight: SolianTheme.toolbarHeight(context),
leading: AppBarLeadingButton.adaptive(context),
actions: [
const BackgroundStateWidget(),
const NotificationButton(),
SizedBox(
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
),
],
bottom: TabBar(
controller: _tabController,
tabs: [
Tab(text: 'postListNews'.tr),
Tab(text: 'postListShuffle'.tr),
],
),
SizedBox(
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
),
],
),
FeedListWidget(controller: _pagingController),
],
)
];
},
body: TabBarView(
controller: _tabController,
children: [
CustomScrollView(slivers: [
FeedListWidget(controller: _pagingController),
]),
CustomScrollView(slivers: [
FeedListWidget(controller: _pagingController),
]),
],
),
),
),
),
@ -93,11 +137,11 @@ class _HomeScreenState extends State<HomeScreen> {
}
}
class FeedCreationButton extends StatelessWidget {
class PostCreatePopup extends StatelessWidget {
final bool hideDraftBox;
final Function? onCreated;
const FeedCreationButton({
const PostCreatePopup({
super.key,
this.hideDraftBox = false,
this.onCreated,
@ -111,35 +155,62 @@ class FeedCreationButton extends StatelessWidget {
return const SizedBox();
}
return PopupMenuButton(
icon: const Icon(Icons.edit_square),
itemBuilder: (BuildContext context) => [
PopupMenuItem(
child: ListTile(
title: Text('postEditor'.tr),
leading: const Icon(Icons.article),
contentPadding: const EdgeInsets.symmetric(horizontal: 8),
final List<dynamic> actionList = [
(
icon: const Icon(Icons.edit_square),
label: 'postEditor'.tr,
onTap: () {
Navigator.pop(context);
AppRouter.instance.pushNamed('postEditor').then((val) {
if (val != null && onCreated != null) onCreated!();
});
},
),
(
icon: const Icon(Icons.drafts),
label: 'draftBoxOpen'.tr,
onTap: () {
Navigator.pop(context);
AppRouter.instance.pushNamed('draftBox');
},
),
];
return SizedBox(
height: MediaQuery.of(context).size.height * 0.35,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'postNew'.tr,
style: Theme.of(context).textTheme.headlineSmall,
).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
Expanded(
child: GridView.count(
physics: const NeverScrollableScrollPhysics(),
crossAxisCount: 3,
children: actionList
.map((x) => Card(
color: Theme.of(context).colorScheme.surfaceContainer,
child: InkWell(
borderRadius:
const BorderRadius.all(Radius.circular(8)),
onTap: x.onTap,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
x.icon,
const SizedBox(height: 8),
Text(x.label),
],
).paddingAll(18),
),
))
.toList(),
).paddingSymmetric(horizontal: 20),
),
onTap: () {
AppRouter.instance.pushNamed('postEditor').then((val) {
if (val != null && onCreated != null) {
onCreated!();
}
});
},
),
if (!hideDraftBox)
PopupMenuItem(
child: ListTile(
title: Text('draftBoxOpen'.tr),
leading: const Icon(Icons.drafts),
contentPadding: const EdgeInsets.symmetric(horizontal: 8),
),
onTap: () {
AppRouter.instance.pushNamed('draftBox');
},
),
],
],
),
);
}
}

View File

@ -83,6 +83,8 @@ const messagesEnglish = {
'notifyAllRead': 'Mark all as read',
'notifyEmpty': 'All notifications read',
'notifyEmptyCaption': 'It seems like nothing happened recently',
'postListNews': 'News',
'postListShuffle': 'Random',
'postEditor': 'Create new post',
'articleEditor': 'Create new article',
'articleDetail': 'Article details',

View File

@ -81,6 +81,8 @@ const simplifiedChineseMessages = {
'articleEditor': '撰写文章',
'articleDetail': '文章详情',
'draftBoxOpen': '打开草稿箱',
'postListNews': '新鲜事',
'postListShuffle': '打乱看',
'postNew': '创建新帖子',
'postNewInRealmHint': '在领域 @realm 里发表新帖子',
'postAction': '发表',