lib/screens/posts/post_detail.dart

@@ -6,7 +6,6 @@ import 'package:solian/providers/content/posts.dart';
 import 'package:solian/providers/last_read.dart';
 import 'package:solian/theme.dart';
 import 'package:solian/widgets/loading_indicator.dart';
-import 'package:solian/widgets/posts/post_action.dart';
 import 'package:solian/widgets/posts/post_item.dart';
 import 'package:solian/widgets/posts/post_replies.dart';
 
@@ -41,7 +40,7 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
 
     Get.find<LastReadProvider>().feedLastReadAt = _item?.id;
 
-    if (mounted) setState(() => _isBusy = false);
+    setState(() => _isBusy = false);
   }
 
   @override
@@ -68,7 +67,6 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
         ),
         SliverToBoxAdapter(
           child: PostItem(
-            key: ValueKey(_item),
             item: _item!,
             isClickable: false,
             isOverrideEmbedClickable: true,
@@ -81,24 +79,6 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
                     vertical: 8,
                   )
                 : EdgeInsets.zero,
-            onTapMore: () {
-              showModalBottomSheet(
-                useRootNavigator: true,
-                context: context,
-                builder: (context) => PostAction(
-                  item: _item!,
-                  noReact: true,
-                ),
-              ).then((value) {
-                if (value is Future) {
-                  value.then((_) {
-                    _getDetail();
-                  });
-                } else if (value != null) {
-                  _getDetail();
-                }
-              });
-            },
           ),
         ),
         SliverToBoxAdapter(

lib/widgets/loading_indicator.dart

@@ -4,13 +4,8 @@ import 'package:gap/gap.dart';
 
 class LoadingIndicator extends StatefulWidget {
   final bool isActive;
-  final Color? backgroundColor;
 
-  const LoadingIndicator({
+  const LoadingIndicator({super.key, this.isActive = true});
-    super.key,
-    this.isActive = true,
-    this.backgroundColor,
-  });
 
   @override
   State<LoadingIndicator> createState() => _LoadingIndicatorState();
@@ -68,7 +63,7 @@ class _LoadingIndicatorState extends State<LoadingIndicator>
       axisAlignment: -1, // Align animation from the top
       child: Container(
         padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 24),
-        color: widget.backgroundColor ??
+        color:
             Theme.of(context).colorScheme.surfaceContainerLow.withOpacity(0.5),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,

lib/widgets/posts/post_action.dart

@@ -11,7 +11,6 @@ import 'package:solian/exts.dart';
 import 'package:solian/models/post.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/providers/content/posts.dart';
 import 'package:solian/router.dart';
 import 'package:solian/screens/posts/post_editor.dart';
 import 'package:solian/widgets/loading_indicator.dart';
@@ -29,14 +28,20 @@ class PostAction extends StatefulWidget {
 }
 
 class _PostActionState extends State<PostAction> {
-  bool _isBusy = false;
+  bool _isBusy = true;
   bool _canModifyContent = false;
 
   void _checkAbleToModifyContent() async {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) return;
 
-    _canModifyContent = auth.userProfile.value!['id'] == widget.item.author.id;
+    setState(() => _isBusy = true);
+
+    setState(() {
+      _canModifyContent =
+          auth.userProfile.value!['id'] == widget.item.author.id;
+      _isBusy = false;
+    });
   }
 
   Future<void> _doShare({bool noUri = false}) async {
@@ -89,8 +94,6 @@ class _PostActionState extends State<PostAction> {
         : List.empty();
     final hasMultipleAttachment = attachments.length > 1;
 
-    setState(() => _isBusy = true);
-
     final screenshot = ScreenshotController();
     final image = await screenshot.captureFromLongWidget(
       MediaQuery(
@@ -134,21 +137,6 @@ class _PostActionState extends State<PostAction> {
       );
       context.showSnackbar('fileSavedAt'.trParams({'path': filepath}));
     }
-
-    setState(() => _isBusy = false);
-  }
-
-  Future<Post> _getFullPost() async {
-    final PostProvider posts = Get.find();
-
-    try {
-      final resp = await posts.getPost(widget.item.id.toString());
-      return Post.fromJson(resp.body);
-    } catch (e) {
-      context.showErrorDialog(e).then((_) => Navigator.pop(context));
-    }
-
-    return widget.item;
   }
 
   @override
@@ -194,13 +182,7 @@ class _PostActionState extends State<PostAction> {
               ),
             ],
           ).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
-          LoadingIndicator(
+          LoadingIndicator(isActive: _isBusy),
-            isActive: _isBusy,
-            backgroundColor: Theme.of(context)
-                .colorScheme
-                .surfaceContainerHigh
-                .withOpacity(0.5),
-          ),
           Expanded(
             child: ListView(
               children: [
@@ -223,12 +205,10 @@ class _PostActionState extends State<PostAction> {
                       IconButton(
                         icon: const Icon(Icons.image),
                         tooltip: 'shareImage'.tr,
-                        onPressed: _isBusy
+                        onPressed: () async {
-                            ? null
+                          await _shareImage();
-                            : () async {
+                          Navigator.pop(context);
-                                await _shareImage();
+                        },
-                                Navigator.pop(context);
-                              },
                       ),
                     ],
                   ),
@@ -308,23 +288,15 @@ class _PostActionState extends State<PostAction> {
                     contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                     leading: const Icon(Icons.edit),
                     title: Text('edit'.tr),
-                    onTap: _isBusy
+                    onTap: () async {
-                        ? null
+                      Navigator.pop(
-                        : () async {
+                        context,
-                            setState(() => _isBusy = true);
+                        AppRouter.instance.pushNamed(
-                            var item = widget.item;
+                          'postEditor',
-                            if (item.body?['content_truncated'] == true) {
+                          extra: PostPublishArguments(edit: widget.item),
-                              item = await _getFullPost();
+                        ),
-                            }
+                      );
-                            Navigator.pop(
+                    },
-                              context,
-                              AppRouter.instance.pushNamed(
-                                'postEditor',
-                                extra: PostPublishArguments(edit: item),
-                              ),
-                            );
-                            if (mounted) setState(() => _isBusy = false);
-                          },
                   ),
                 if (_canModifyContent)
                   ListTile(

lib/widgets/posts/post_item.dart

@@ -38,7 +38,6 @@ class PostItem extends StatefulWidget {
   final EdgeInsets? padding;
 
   final Function? onComment;
-  final Function? onTapMore;
 
   const PostItem({
     super.key,
@@ -56,7 +55,6 @@ class PostItem extends StatefulWidget {
     this.attachmentParent,
     this.padding,
     this.onComment,
-    this.onTapMore,
   });
 
   @override
@@ -101,7 +99,6 @@ class _PostItemState extends State<PostItem> {
           _PostHeaderWidget(
             isCompact: widget.isCompact,
             isFullDate: widget.isFullDate,
-            onTapMore: widget.onTapMore,
             item: item,
           ).paddingSymmetric(horizontal: 12),
           _PostHeaderDividerWidget(item: item).paddingSymmetric(horizontal: 12),
@@ -164,7 +161,6 @@ class _PostItemState extends State<PostItem> {
               _PostHeaderWidget(
                 isCompact: widget.isCompact,
                 isFullDate: widget.isFullDate,
-                onTapMore: widget.onTapMore,
                 item: item,
               ),
               _PostHeaderDividerWidget(item: item),
@@ -592,13 +588,10 @@ class _PostHeaderWidget extends StatelessWidget {
   final bool isFullDate;
   final Post item;
 
-  final Function? onTapMore;
-
   const _PostHeaderWidget({
     required this.isCompact,
     required this.isFullDate,
     required this.item,
-    required this.onTapMore,
   });
 
   @override
@@ -656,12 +649,10 @@ class _PostHeaderWidget extends StatelessWidget {
                 ],
               ),
             ),
-            if (onTapMore != null)
+            if (item.type == 'article')
-              IconButton(
+              Badge(
-                color: Theme.of(context).colorScheme.primary,
+                label: Text('article'.tr),
-                icon: const Icon(Icons.more_vert),
+              ).paddingOnly(top: 3),
-                onPressed: () => onTapMore!(),
-              ),
           ],
         ),
         const Gap(8),

lib/widgets/posts/post_list.dart

@@ -105,7 +105,6 @@ class PostListEntryWidget extends StatelessWidget {
           isClickable: isNestedClickable,
           showFeaturedReply: showFeaturedReply,
           padding: padding,
-          onTapMore: () => _openActions(context),
           onComment: () {
             AppRouter.instance
                 .pushNamed(