lib/providers/content/posts.dart

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

lib/screens/feed/draft_box.dart

@@ -4,6 +4,7 @@ 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';
@@ -63,6 +64,10 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
           centerTitle: false,
           toolbarHeight: SolianTheme.toolbarHeight(context),
           actions: [
+            FeedCreationButton(
+              hideDraftBox: true,
+              onCreated: () {},
+            ),
             SizedBox(
               width: SolianTheme.isLargeScreen(context) ? 8 : 16,
             ),

lib/screens/home.dart

@@ -20,24 +20,16 @@ class HomeScreen extends StatefulWidget {
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
-class _HomeScreenState extends State<HomeScreen>
-    with SingleTickerProviderStateMixin {
+class _HomeScreenState extends State<HomeScreen> {
   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,
-        channel: mode == 0 ? null : 'shuffle',
-      );
+      resp = await provider.listRecommendations(pageKey);
     } catch (e) {
       _pagingController.error = e;
       return;
@@ -56,74 +48,38 @@ 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 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(
+    return Scaffold(
+      body: Material(
+        color: Theme.of(context).colorScheme.surface,
+        child: RefreshIndicator(
           onRefresh: () => Future.sync(() => _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),
-                    ],
+          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();
+                    },
                   ),
-                )
-              ];
-            },
-            body: TabBarView(
-              controller: _tabController,
-              children: [
-                CustomScrollView(slivers: [
-                  FeedListWidget(controller: _pagingController),
-                ]),
-                CustomScrollView(slivers: [
-                  FeedListWidget(controller: _pagingController),
-                ]),
-              ],
-            ),
+                  SizedBox(
+                    width: SolianTheme.isLargeScreen(context) ? 8 : 16,
+                  ),
+                ],
+              ),
+              FeedListWidget(controller: _pagingController),
+            ],
           ),
         ),
       ),
@@ -137,11 +93,11 @@ class _HomeScreenState extends State<HomeScreen>
   }
 }
 
-class PostCreatePopup extends StatelessWidget {
+class FeedCreationButton extends StatelessWidget {
   final bool hideDraftBox;
   final Function? onCreated;
 
-  const PostCreatePopup({
+  const FeedCreationButton({
     super.key,
     this.hideDraftBox = false,
     this.onCreated,
@@ -155,62 +111,35 @@ class PostCreatePopup extends StatelessWidget {
       return const SizedBox();
     }
 
-    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),
+    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),
           ),
-        ],
-      ),
+          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');
+            },
+          ),
+      ],
     );
   }
 }

lib/translations/en_us.dart

@@ -83,8 +83,6 @@ 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',

lib/translations/zh_cn.dart

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