🐛 Bug fixes in posts

lib/screens/explore.dart

@@ -449,7 +449,7 @@ class _PostListWidgetState extends State<_PostListWidget> {
           data: ele.toJson(),
           createdAt: ele.createdAt)),
     );
-    _hasLoadedAll = postCount >= _feed.length;
+    _hasLoadedAll = _feed.length >= postCount;
 
     if (mounted) setState(() => _isBusy = false);
   }

lib/widgets/post/post_comment_list.dart

@@ -151,6 +151,7 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
             },
           ),
           onTap: () {
+            Navigator.pop(context);
             GoRouter.of(context).pushNamed(
               'postDetail',
               pathParameters: {'slug': _posts[idx].id.toString()},
@@ -225,6 +226,9 @@ class _PostCommentListPopupState extends State<PostCommentListPopup> {
                         onPost: () {
                           _childListKey.currentState!.refresh();
                         },
+                        onExpand: () {
+                          Navigator.pop(context);
+                        },
                       ),
                     ),
                   ),

lib/widgets/post/post_item.dart

@@ -103,7 +103,7 @@ class OpenablePostItem extends StatelessWidget {
           transitionType: ContainerTransitionType.fade,
           closedElevation: 0,
           closedColor: Theme.of(context).colorScheme.surface.withOpacity(
-                cfg.prefs.getBool(kAppBackgroundStoreKey) == true ? 0.75 : 1,
+                cfg.prefs.getBool(kAppBackgroundStoreKey) == true ? 0 : 1,
               ),
           closedShape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.all(Radius.circular(16)),
@@ -122,6 +122,7 @@ class PostItem extends StatefulWidget {
   final bool showMenu;
   final bool showFullPost;
   final bool showAvatar;
+  final bool showCompactAvatar;
   final bool showExpandableComments;
   final double? maxWidth;
   final Function(SnPost data)? onChanged;
@@ -137,6 +138,7 @@ class PostItem extends StatefulWidget {
     this.showMenu = true,
     this.showFullPost = false,
     this.showAvatar = true,
+    this.showCompactAvatar = false,
     this.showExpandableComments = false,
     this.maxWidth,
     this.onChanged,
@@ -297,185 +299,180 @@ class _PostItemState extends State<PostItem> {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           Container(
-            constraints:
+            constraints: BoxConstraints(
-                BoxConstraints(maxWidth: widget.maxWidth ?? double.infinity),
+              maxWidth: widget.maxWidth ?? double.infinity,
+            ),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Expanded(
+                Row(
-                  child: Column(
+                  children: [
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    if (widget.showAvatar)
-                    children: [
+                      _PostAvatar(
-                      Row(
+                        data: widget.data,
+                        isCompact: false,
+                      ),
+                    if (widget.showAvatar) const Gap(12),
+                    Expanded(
+                      child: Row(
                         children: [
-                          if (widget.showAvatar)
+                          if (widget.showCompactAvatar)
                             _PostAvatar(
                               data: widget.data,
-                              isCompact: false,
+                              isCompact: true,
                             ),
-                          if (widget.showAvatar) const Gap(12),
+                          if (widget.showAvatar) const Gap(8),
-                          Expanded(
+                          _PostContentHeader(
-                            child: _PostContentHeader(
+                            isRelativeDate: !widget.showFullPost,
-                              isRelativeDate: !widget.showFullPost,
+                            isCompact: false,
-                              isCompact: false,
-                              data: widget.data,
-                            ),
-                          ),
-                          _PostActionPopup(
                             data: widget.data,
-                            isAuthor: isAuthor,
-                            onShare: () => _doShare(context),
-                            onShareImage: () => _doShareViaPicture(context),
-                            onSelectAnswer: widget.onSelectAnswer,
-                            onDeleted: () {
-                              widget.onDeleted?.call();
-                            },
-                            onTranslate: () {
-                              _translateText();
-                            },
                           ),
                         ],
                       ),
-                      const Gap(8),
+                    ),
-                      if (widget.data.preload?.thumbnail != null)
+                    _PostActionPopup(
-                        Container(
+                      data: widget.data,
-                          margin: const EdgeInsets.only(bottom: 8),
+                      isAuthor: isAuthor,
-                          decoration: BoxDecoration(
+                      onShare: () => _doShare(context),
-                            borderRadius: const BorderRadius.all(
+                      onShareImage: () => _doShareViaPicture(context),
-                              Radius.circular(8),
+                      onSelectAnswer: widget.onSelectAnswer,
-                            ),
+                      onDeleted: () {
-                            border: Border.all(
+                        widget.onDeleted?.call();
-                              color: Theme.of(context).dividerColor,
+                      },
-                              width: 1,
+                      onTranslate: () {
-                            ),
+                        _translateText();
-                          ),
+                      },
-                          child: AspectRatio(
+                    ),
-                            aspectRatio: 16 / 9,
+                  ],
-                            child: ClipRRect(
+                ),
-                              borderRadius: const BorderRadius.all(
+                const Gap(8),
-                                Radius.circular(8),
+                if (widget.data.preload?.thumbnail != null)
-                              ),
+                  Container(
-                              child: AutoResizeUniversalImage(
+                    margin: const EdgeInsets.only(bottom: 8),
-                                sn.getAttachmentUrl(
+                    decoration: BoxDecoration(
-                                  widget.data.preload!.thumbnail!.rid,
+                      borderRadius: const BorderRadius.all(
-                                ),
+                        Radius.circular(8),
-                                fit: BoxFit.cover,
-                              ),
-                            ),
-                          ),
-                        ),
-                      if (widget.data.preload?.video != null)
-                        _PostVideoPlayer(data: widget.data).padding(bottom: 8),
-                      if (widget.data.type == 'question')
-                        _PostQuestionHint(data: widget.data).padding(bottom: 8),
-                      if (_displayDescription.isNotEmpty ||
-                          _displayTitle.isNotEmpty)
-                        _PostHeadline(
-                          title: _displayTitle,
-                          description: _displayDescription,
-                          data: widget.data,
-                          isEnlarge: widget.data.type == 'article' &&
-                              widget.showFullPost,
-                        ).padding(bottom: 8),
-                      if (widget.data.type == 'article' && !widget.showFullPost)
-                        Text('postArticle')
-                            .tr()
-                            .fontSize(13)
-                            .opacity(0.75)
-                            .padding(bottom: 8),
-                      if ((_displayText.isNotEmpty) &&
-                          (widget.showFullPost ||
-                              widget.data.type != 'article'))
-                        _PostContentBody(
-                          text: _displayText,
-                          data: widget.data,
-                          isSelectable: widget.showFullPost,
-                          isEnlarge: widget.data.type == 'article' &&
-                              widget.showFullPost,
-                        ).padding(bottom: 6),
-                      if (widget.data.visibility > 0)
-                        _PostVisibilityHint(data: widget.data).padding(
-                          vertical: 4,
-                        ),
-                      if (widget.data.body['content_truncated'] == true)
-                        _PostTruncatedHint(data: widget.data).padding(
-                          vertical: 4,
-                        ),
-                      if (widget.data.tags.isNotEmpty)
-                        _PostTagsList(data: widget.data)
-                            .padding(top: 4, bottom: 6),
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        spacing: 4,
-                        children: [
-                          if (widget.showViews)
-                            Row(
-                              children: [
-                                Icon(Symbols.play_circle, size: 20),
-                                const Gap(4),
-                                Text('postViews')
-                                    .plural(widget.data.totalViews),
-                              ],
-                            ).opacity(0.75),
-                          if (_isTranslating)
-                            AnimateWidgetExtensions(Row(
-                              children: [
-                                Icon(Symbols.translate, size: 20),
-                                const Gap(4),
-                                Text('translating').tr(),
-                              ],
-                            ))
-                                .animate(onPlay: (e) => e.repeat())
-                                .fadeIn(duration: 500.ms, curve: Curves.easeOut)
-                                .then()
-                                .fadeOut(
-                                  duration: 500.ms,
-                                  delay: 1000.ms,
-                                  curve: Curves.easeIn,
-                                ),
-                          if (_isTranslated)
-                            InkWell(
-                              child: Row(
-                                children: [
-                                  Icon(Symbols.translate, size: 20),
-                                  const Gap(4),
-                                  Text('translated').tr(),
-                                ],
-                              ).opacity(0.75),
-                              onTap: () {
-                                setState(() {
-                                  _displayText =
-                                      widget.data.body['content'] ?? '';
-                                  _displayTitle =
-                                      widget.data.body['title'] ?? '';
-                                  _displayDescription =
-                                      widget.data.body['description'] ?? '';
-                                  _isTranslated = false;
-                                });
-                              },
-                            ),
-                          if (widget.data.repostTo != null)
-                            _PostQuoteContent(child: widget.data.repostTo!)
-                                .padding(
-                              top: 4,
-                              bottom: widget.data.preload?.attachments
-                                          ?.isNotEmpty ??
-                                      false
-                                  ? 12
-                                  : 0,
-                            ),
-                        ],
-                      ).padding(
-                        bottom:
-                            widget.showViews || _isTranslated || _isTranslating
-                                ? 8
-                                : 0,
                       ),
-                    ],
+                      border: Border.all(
+                        color: Theme.of(context).dividerColor,
+                        width: 1,
+                      ),
+                    ),
+                    child: AspectRatio(
+                      aspectRatio: 16 / 9,
+                      child: ClipRRect(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(8),
+                        ),
+                        child: AutoResizeUniversalImage(
+                          sn.getAttachmentUrl(
+                            widget.data.preload!.thumbnail!.rid,
+                          ),
+                          fit: BoxFit.cover,
+                        ),
+                      ),
+                    ),
                   ),
-                ).padding(horizontal: 12, top: 8),
+                if (widget.data.preload?.video != null)
+                  _PostVideoPlayer(data: widget.data).padding(bottom: 8),
+                if (widget.data.type == 'question')
+                  _PostQuestionHint(data: widget.data).padding(bottom: 8),
+                if (_displayDescription.isNotEmpty || _displayTitle.isNotEmpty)
+                  _PostHeadline(
+                    title: _displayTitle,
+                    description: _displayDescription,
+                    data: widget.data,
+                    isEnlarge:
+                        widget.data.type == 'article' && widget.showFullPost,
+                  ).padding(bottom: 8),
+                if (widget.data.type == 'article' && !widget.showFullPost)
+                  Text('postArticle')
+                      .tr()
+                      .fontSize(13)
+                      .opacity(0.75)
+                      .padding(bottom: 8),
+                if ((_displayText.isNotEmpty) &&
+                    (widget.showFullPost || widget.data.type != 'article'))
+                  _PostContentBody(
+                    text: _displayText,
+                    data: widget.data,
+                    isSelectable: widget.showFullPost,
+                    isEnlarge:
+                        widget.data.type == 'article' && widget.showFullPost,
+                  ).padding(bottom: 6),
+                if (widget.data.visibility > 0)
+                  _PostVisibilityHint(data: widget.data).padding(
+                    vertical: 4,
+                  ),
+                if (widget.data.body['content_truncated'] == true)
+                  _PostTruncatedHint(data: widget.data).padding(
+                    vertical: 4,
+                  ),
+                if (widget.data.tags.isNotEmpty)
+                  _PostTagsList(data: widget.data).padding(top: 4, bottom: 6),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  spacing: 4,
+                  children: [
+                    if (widget.showViews)
+                      Row(
+                        children: [
+                          Icon(Symbols.play_circle, size: 20),
+                          const Gap(4),
+                          Text('postViews').plural(widget.data.totalViews),
+                        ],
+                      ).opacity(0.75),
+                    if (_isTranslating)
+                      AnimateWidgetExtensions(Row(
+                        children: [
+                          Icon(Symbols.translate, size: 20),
+                          const Gap(4),
+                          Text('translating').tr(),
+                        ],
+                      ))
+                          .animate(onPlay: (e) => e.repeat())
+                          .fadeIn(duration: 500.ms, curve: Curves.easeOut)
+                          .then()
+                          .fadeOut(
+                            duration: 500.ms,
+                            delay: 1000.ms,
+                            curve: Curves.easeIn,
+                          ),
+                    if (_isTranslated)
+                      InkWell(
+                        child: Row(
+                          children: [
+                            Icon(Symbols.translate, size: 20),
+                            const Gap(4),
+                            Text('translated').tr(),
+                          ],
+                        ).opacity(0.75),
+                        onTap: () {
+                          setState(() {
+                            _displayText = widget.data.body['content'] ?? '';
+                            _displayTitle = widget.data.body['title'] ?? '';
+                            _displayDescription =
+                                widget.data.body['description'] ?? '';
+                            _isTranslated = false;
+                          });
+                        },
+                      ),
+                    if (widget.data.repostTo != null)
+                      _PostQuoteContent(child: widget.data.repostTo!).padding(
+                        top: 4,
+                        bottom: widget.data.preload?.attachments?.isNotEmpty ??
+                                false
+                            ? 12
+                            : 0,
+                      ),
+                  ],
+                ).padding(
+                  bottom: widget.showViews || _isTranslated || _isTranslating
+                      ? 8
+                      : 0,
+                ),
               ],
-            ),
+            ).padding(horizontal: 12, top: 8),
           ),
           if (displayableAttachments?.isNotEmpty ?? false)
             AttachmentList(
@@ -509,6 +506,7 @@ class _PostItemState extends State<PostItem> {
             _PostCommentIntent(
               data: widget.data,
               showAvatar: widget.showAvatar,
+              maxWidth: widget.maxWidth ?? double.infinity,
             ).padding(left: 12, right: 12)
           else
             _PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
@@ -558,10 +556,22 @@ class _PostItemState extends State<PostItem> {
                         Row(
                           children: [
                             Expanded(
-                              child: _PostContentHeader(
+                              child: Row(
-                                isRelativeDate: !widget.showFullPost,
+                                children: [
-                                isCompact: true,
+                                  if (widget.showCompactAvatar)
-                                data: widget.data,
+                                    _PostAvatar(
+                                      data: widget.data,
+                                      isCompact: true,
+                                    ),
+                                  if (widget.showCompactAvatar) const Gap(8),
+                                  Expanded(
+                                    child: _PostContentHeader(
+                                      isRelativeDate: !widget.showFullPost,
+                                      isCompact: true,
+                                      data: widget.data,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
                             _PostActionPopup(
@@ -578,7 +588,7 @@ class _PostItemState extends State<PostItem> {
                               },
                             ),
                           ],
-                        ),
+                        ).padding(bottom: widget.showCompactAvatar ? 4 : 0),
                         if (widget.data.preload?.thumbnail != null)
                           Container(
                             margin: const EdgeInsets.only(bottom: 8),
@@ -755,19 +765,28 @@ class _PostItemState extends State<PostItem> {
         if (widget.showExpandableComments)
           _PostCommentIntent(
             data: widget.data,
+            maxWidth: (widget.maxWidth ?? double.infinity) -
+                (widget.showAvatar ? 72 : 24),
             showAvatar: widget.showAvatar,
           ).padding(left: widget.showAvatar ? 60 : 12, right: 12)
         else if (widget.showComments)
           _PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
               .padding(left: widget.showAvatar ? 60 : 12, right: 12),
         if (widget.showReactions)
-          Padding(
+          Container(
-            padding: const EdgeInsets.only(top: 4),
+            constraints: BoxConstraints(
-            child: _PostReactionList(
+              maxWidth: widget.maxWidth ?? double.infinity,
-              data: widget.data,
+            ),
-              padding:
+            child: Padding(
-                  EdgeInsets.only(left: widget.showAvatar ? 60 : 12, right: 12),
+              padding: const EdgeInsets.only(top: 4),
-              onChanged: _onChanged,
+              child: _PostReactionList(
+                data: widget.data,
+                padding: EdgeInsets.only(
+                  left: widget.showAvatar ? 60 : 12,
+                  right: 12,
+                ),
+                onChanged: _onChanged,
+              ),
             ),
           ),
       ],
@@ -1552,19 +1571,24 @@ class _PostContentHeader extends StatelessWidget {
     if (isCompact) {
       return Row(
         children: [
-          Text(data.publisher.nick).bold(),
+          Flexible(
+            child: Text(
+              data.publisher.nick,
+              maxLines: 1,
+            ).bold(),
+          ),
           const Gap(4),
-          Row(
+          Flexible(
-            children: [
+            child: Text(
-              Text(
+              isRelativeDate
-                isRelativeDate
+                  ? RelativeTime(context)
-                    ? RelativeTime(context)
+                      .format((data.publishedAt ?? data.createdAt).toLocal())
-                        .format((data.publishedAt ?? data.createdAt).toLocal())
+                  : DateFormat('y/M/d HH:mm')
-                    : DateFormat('y/M/d HH:mm')
+                      .format((data.publishedAt ?? data.createdAt).toLocal()),
-                        .format((data.publishedAt ?? data.createdAt).toLocal()),
+              maxLines: 1,
-              ).fontSize(13),
+              overflow: TextOverflow.fade,
-            ],
+            ).fontSize(13).opacity(0.8),
-          ).opacity(0.8),
+          ),
         ],
       );
     } else {
@@ -1583,7 +1607,10 @@ class _PostContentHeader extends StatelessWidget {
           ),
           Row(
             children: [
-              Text('@${data.publisher.name}').fontSize(13),
+              Text(
+                '@${data.publisher.name}',
+                maxLines: 1,
+              ).fontSize(13),
               const Gap(4),
               Text(
                 isRelativeDate
@@ -1591,6 +1618,8 @@ class _PostContentHeader extends StatelessWidget {
                         .format((data.publishedAt ?? data.createdAt).toLocal())
                     : DateFormat('y/M/d HH:mm')
                         .format((data.publishedAt ?? data.createdAt).toLocal()),
+                maxLines: 1,
+                overflow: TextOverflow.fade,
               ).fontSize(13),
             ],
           ).opacity(0.8),
@@ -1856,7 +1885,12 @@ class _PostTruncatedHint extends StatelessWidget {
 class _PostCommentIntent extends StatefulWidget {
   final SnPost data;
   final bool showAvatar;
-  const _PostCommentIntent({required this.data, this.showAvatar = false});
+  final double maxWidth;
+  const _PostCommentIntent({
+    required this.data,
+    this.showAvatar = false,
+    required this.maxWidth,
+  });
 
   @override
   State<_PostCommentIntent> createState() => _PostCommentIntentState();
@@ -1895,54 +1929,69 @@ class _PostCommentIntentState extends State<_PostCommentIntent> {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return Container(
-      children: [
+      constraints: BoxConstraints(maxWidth: widget.maxWidth),
-        if (_comments.isNotEmpty)
+      child: Column(
-          Card(
+        children: [
-            elevation: 4,
+          if (_comments.isNotEmpty)
-            margin: EdgeInsets.zero,
+            Card(
-            child: Column(
+              elevation: 4,
-              spacing: 8,
+              margin: EdgeInsets.zero,
-              children: [
+              child: Column(
-                for (final ele in _comments)
+                spacing: 8,
-                  PostItem(
+                children: [
-                    data: ele,
+                  for (final ele in _comments)
-                    showAvatar: false,
+                    InkWell(
-                    showExpandableComments: true,
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
-                    showReactions: false,
+                      child: PostItem(
-                    showViews: false,
+                        data: ele,
-                    maxWidth: double.infinity,
+                        showAvatar: false,
-                  ).padding(vertical: 8, left: 6),
+                        showCompactAvatar: true,
-              ],
+                        showExpandableComments: true,
-            ),
+                        showReactions: false,
-          ).padding(vertical: 8),
+                        showViews: false,
-        Row(
+                        maxWidth: double.infinity,
-          children: [
+                      ).padding(vertical: 8, left: 6),
-            Transform.flip(
+                      onTap: () {
-              flipX: true,
+                        GoRouter.of(context).pushNamed(
-              child: const Icon(Symbols.comment, size: 20),
+                          'postDetail',
-            ),
+                          pathParameters: {'slug': ele.id.toString()},
-            const Gap(4),
+                          extra: ele,
-            Text('postCommentsDetailed'.plural(widget.data.metric.replyCount)),
+                        );
-            if (widget.data.metric.replyCount > 0 && !_isAllLoaded)
+                      },
-              SizedBox(
+                    ),
-                width: 20,
+                ],
-                height: 20,
+              ),
-                child: IconButton(
+            ).padding(vertical: 8),
-                  visualDensity: VisualDensity(horizontal: -4, vertical: -4),
+          Row(
-                  constraints: const BoxConstraints(),
+            children: [
-                  padding: EdgeInsets.zero,
+              Transform.flip(
-                  icon: const Icon(Symbols.expand_more, size: 18),
+                flipX: true,
-                  onPressed: _isBusy
+                child: const Icon(Symbols.comment, size: 20),
-                      ? null
+              ),
-                      : () {
+              const Gap(4),
-                          _fetchComments();
+              Text(
-                        },
+                  'postCommentsDetailed'.plural(widget.data.metric.replyCount)),
-                ),
+              if (widget.data.metric.replyCount > 0 && !_isAllLoaded)
-              ).padding(left: 8),
+                SizedBox(
-          ],
+                  width: 20,
-        ).opacity(0.75).padding(horizontal: widget.showAvatar ? 4 : 0),
+                  height: 20,
-      ],
+                  child: IconButton(
+                    visualDensity: VisualDensity(horizontal: -4, vertical: -4),
+                    constraints: const BoxConstraints(),
+                    padding: EdgeInsets.zero,
+                    icon: const Icon(Symbols.expand_more, size: 18),
+                    onPressed: _isBusy
+                        ? null
+                        : () {
+                            _fetchComments();
+                          },
+                  ),
+                ).padding(left: 8),
+            ],
+          ).opacity(0.75).padding(horizontal: widget.showAvatar ? 4 : 0),
+        ],
+      ),
     );
   }
 }

lib/widgets/post/post_mini_editor.dart

@@ -9,6 +9,7 @@ import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/controllers/post_write_controller.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/sn_network.dart';
+import 'package:surface/screens/post/post_editor.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/account/account_image.dart';
 import 'package:surface/widgets/dialog.dart';
@@ -17,8 +18,10 @@ import 'package:surface/widgets/loading_indicator.dart';
 class PostMiniEditor extends StatefulWidget {
   final int? postReplyId;
   final Function? onPost;
+  final Function? onExpand;
 
-  const PostMiniEditor({super.key, this.postReplyId, this.onPost});
+  const PostMiniEditor(
+      {super.key, this.postReplyId, this.onPost, this.onExpand});
 
   @override
   State<PostMiniEditor> createState() => _PostMiniEditorState();
@@ -214,12 +217,16 @@ class _PostMiniEditorState extends State<PostMiniEditor> {
                     onPressed: () {
                       GoRouter.of(context).pushNamed(
                         'postEditor',
+                        extra: PostEditorExtra(
+                          text: _writeController.contentController.text,
+                        ),
                         queryParameters: {
                           if (widget.postReplyId != null)
                             'replying': widget.postReplyId.toString(),
                           'mode': 'stories',
                         },
                       );
+                      widget.onExpand?.call();
                     },
                   ),
                   TextButton.icon(

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.4.2+81
+version: 2.4.2+82
 
 environment:
   sdk: ^3.5.4