🐛 Bug fixes

lib/providers/attachment_uploader.dart

@@ -138,8 +138,9 @@ class AttachmentUploaderController extends GetxController {
       queueOfUpload[idx].isCompleted = true;
     }
 
-    queueOfUpload.value =
-        queueOfUpload.where((x) => x.error == null).toList(growable: true);
+    queueOfUpload.value = queueOfUpload
+        .where((x) => x.error == null && x.isCompleted)
+        .toList(growable: true);
     _stopProgressSyncTimer();
     _syncProgress();
 

lib/providers/content/attachment.dart

@@ -89,6 +89,8 @@ class AttachmentProvider extends GetConnect {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
 
+    await auth.ensureCredentials();
+
     final filePayload =
         dio.MultipartFile.fromBytes(data, filename: basename(path));
     final fileAlt = basename(path).contains('.')

lib/screens/feed/draft_box.dart

@@ -21,7 +21,7 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
   final PagingController<int, Post> _pagingController =
       PagingController(firstPageKey: 0);
 
-  getPosts(int pageKey) async {
+  _getPosts(int pageKey) async {
     final PostProvider provider = Get.find();
 
     Response resp;
@@ -49,7 +49,7 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
   @override
   void initState() {
     super.initState();
-    _pagingController.addPageRequestListener(getPosts);
+    _pagingController.addPageRequestListener(_getPosts);
   }
 
   @override
@@ -76,6 +76,7 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
               itemBuilder: (context, item, index) {
                 return PostOwnedListEntry(
                   item: item,
+                  isFullContent: true,
                   backgroundColor:
                       Theme.of(context).colorScheme.surfaceContainerLow,
                   onTap: () async {

lib/screens/posts/post_detail.dart

@@ -59,7 +59,8 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
               SliverToBoxAdapter(
                 child: PostItem(
                   item: item!,
-                  isClickable: true,
+                  isClickable: false,
+                  isOverrideEmbedClickable: true,
                   isFullDate: true,
                   isFullContent: true,
                   isShowReply: false,

lib/translations/en_us.dart

@@ -12,6 +12,7 @@ const i18nEnglish = {
   'draftBox': 'Draft Box',
   'more': 'More',
   'share': 'Share',
+  'shareNoUri': 'Share text content',
   'feed': 'Feed',
   'unlink': 'Unlink',
   'feedSearch': 'Search Feed',

lib/translations/zh_cn.dart

@@ -20,6 +20,7 @@ const i18nSimplifiedChinese = {
   'draftBox': '草稿箱',
   'more': '更多',
   'share': '分享',
+  'shareNoUri': '分享文字内容',
   'feed': '资讯',
   'unlink': '移除链接',
   'feedSearch': '搜索资讯',

lib/widgets/attachments/attachment_editor.dart

@@ -597,30 +597,39 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       Expanded(
-                        child: Text(
-                          'attachmentAdd'.tr,
-                          style: Theme.of(context).textTheme.headlineSmall,
-                          maxLines: 2,
-                          overflow: TextOverflow.fade,
+                        child: Row(
+                          children: [
+                            Expanded(
+                              child: Text(
+                                'attachmentAdd'.tr,
+                                style:
+                                    Theme.of(context).textTheme.headlineSmall,
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            ),
+                            const SizedBox(width: 10),
+                            Obx(() {
+                              if (_uploadController.isUploading.value) {
+                                return SizedBox(
+                                  width: 18,
+                                  height: 18,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2.5,
+                                    value: _uploadController
+                                        .progressOfUpload.value,
+                                  ),
+                                );
+                              }
+                              return const SizedBox();
+                            }),
+                          ],
                         ),
                       ),
-                      const SizedBox(width: 10),
-                      Obx(() {
-                        if (_uploadController.isUploading.value) {
-                          return SizedBox(
-                            width: 18,
-                            height: 18,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2.5,
-                              value: _uploadController.progressOfUpload.value,
-                            ),
-                          );
-                        }
-                        return const SizedBox();
-                      }),
                     ],
                   ),
                 ),
+                const SizedBox(width: 20),
                 Text('attachmentAutoUpload'.tr),
                 const SizedBox(width: 8),
                 Switch(

lib/widgets/posts/post_action.dart

@@ -7,6 +7,7 @@ import 'package:get/get.dart';
 import 'package:share_plus/share_plus.dart';
 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/router.dart';
 import 'package:solian/screens/posts/post_editor.dart';
@@ -38,19 +39,32 @@ class _PostActionState extends State<PostAction> {
     });
   }
 
-  Future<void> _doShare() async {
+  Future<void> _doShare({bool noUri = false}) async {
     final box = context.findRenderObject() as RenderBox?;
-    await Share.share(
-      'postShareContent'.trParams({
-        'username': widget.item.author.nick,
-        'content': widget.item.body['content'] ?? 'no content',
-        'link': 'https://sn.solsynth.dev/posts/view/${widget.item.id}',
-      }),
-      subject: 'postShareSubject'.trParams({
-        'username': widget.item.author.nick,
-      }),
-      sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
-    );
+    if ((PlatformInfo.isAndroid || PlatformInfo.isIOS) && !noUri) {
+      await Share.shareUri(
+        Uri.parse('https://sn.solsynth.dev/posts/view/${widget.item.id}'),
+        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+      );
+    } else {
+      final extraContent = [
+        widget.item.body['title'],
+        widget.item.body['description'],
+      ];
+      final isExtraNotEmpty = extraContent.any((x) => x != null);
+      await Share.share(
+        'postShareContent'.trParams({
+          'username': widget.item.author.nick,
+          'content':
+              '${extraContent.join('\n')}${isExtraNotEmpty ? '\n\n' : ''}${widget.item.body['content'] ?? 'no content'}',
+          'link': 'https://sn.solsynth.dev/posts/view/${widget.item.id}',
+        }),
+        subject: 'postShareSubject'.trParams({
+          'username': widget.item.author.nick,
+        }),
+        sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+      );
+    }
   }
 
   @override
@@ -86,6 +100,16 @@ class _PostActionState extends State<PostAction> {
                   contentPadding: const EdgeInsets.symmetric(horizontal: 24),
                   leading: const Icon(Icons.share),
                   title: Text('share'.tr),
+                  trailing: PlatformInfo.isIOS || PlatformInfo.isAndroid
+                      ? IconButton(
+                          icon: const Icon(Icons.link_off),
+                          tooltip: 'shareNoUri'.tr,
+                          onPressed: () async {
+                            await _doShare(noUri: true);
+                            Navigator.pop(context);
+                          },
+                        )
+                      : null,
                   onTap: () async {
                     await _doShare();
                     Navigator.pop(context);

lib/widgets/posts/post_item.dart

@@ -23,6 +23,7 @@ class PostItem extends StatefulWidget {
   final bool isReactable;
   final bool isShowReply;
   final bool isShowEmbed;
+  final bool isOverrideEmbedClickable;
   final bool isFullDate;
   final bool isFullContent;
   final bool isContentSelectable;
@@ -37,6 +38,7 @@ class PostItem extends StatefulWidget {
     this.isReactable = true,
     this.isShowReply = true,
     this.isShowEmbed = true,
+    this.isOverrideEmbedClickable = false,
     this.isFullDate = false,
     this.isFullContent = false,
     this.isContentSelectable = false,
@@ -76,12 +78,13 @@ class _PostItemState extends State<PostItem> {
 
   Widget _buildHeader() {
     return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         if (widget.isCompact)
           AccountAvatar(
             content: item.author.avatar.toString(),
             radius: 10,
-          ).paddingOnly(left: 2),
+          ).paddingOnly(left: 2, top: 1),
         Expanded(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -108,18 +111,26 @@ class _PostItemState extends State<PostItem> {
                   item.body['description'],
                   style: Theme.of(context).textTheme.bodySmall,
                 ),
-              if (item.body['description'] != null ||
-                  item.body['title'] != null)
-                const Divider(thickness: 0.3, height: 1).paddingSymmetric(
-                  vertical: 8,
-                ),
             ],
           ).paddingOnly(left: widget.isCompact ? 6 : 12),
         ),
+        if (widget.item.type == 'article')
+          Badge(
+            label: Text('article'.tr),
+          ).paddingOnly(top: 3),
       ],
     );
   }
 
+  Widget _buildHeaderDivider() {
+    if (item.body['description'] != null || item.body['title'] != null) {
+      return const Divider(thickness: 0.3, height: 1).paddingSymmetric(
+        vertical: 8,
+      );
+    }
+    return const SizedBox();
+  }
+
   Widget _buildFooter() {
     List<String> labels = List.empty(growable: true);
     if (widget.item.editedAt != null) {
@@ -167,7 +178,7 @@ class _PostItemState extends State<PostItem> {
 
   Widget _buildReply(BuildContext context) {
     return OpenContainer(
-      tappable: widget.isClickable,
+      tappable: widget.isClickable || widget.isOverrideEmbedClickable,
       closedBuilder: (_, openContainer) => Column(
         children: [
           Row(
@@ -214,7 +225,7 @@ class _PostItemState extends State<PostItem> {
 
   Widget _buildRepost(BuildContext context) {
     return OpenContainer(
-      tappable: widget.isClickable,
+      tappable: widget.isClickable || widget.isOverrideEmbedClickable,
       closedBuilder: (_, openContainer) => Column(
         children: [
           Row(
@@ -273,14 +284,50 @@ class _PostItemState extends State<PostItem> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           _buildHeader().paddingSymmetric(horizontal: 12),
-          MarkdownTextContent(
-            content: item.body['content'],
-            isSelectable: widget.isContentSelectable,
-          ).paddingOnly(
-            left: 16,
-            right: 12,
-            top: 2,
-            bottom: hasAttachment ? 4 : 0,
+          _buildHeaderDivider().paddingSymmetric(horizontal: 12),
+          Stack(
+            children: [
+              SizedContainer(
+                maxWidth: 640,
+                maxHeight: widget.isFullContent ? double.infinity : 80,
+                child: _MeasureSize(
+                  onChange: (size) {
+                    setState(() => _contentHeight = size.height);
+                  },
+                  child: MarkdownTextContent(
+                    content: item.body['content'],
+                    isSelectable: widget.isContentSelectable,
+                  ).paddingOnly(
+                    left: 16,
+                    right: 12,
+                    top: 2,
+                    bottom: hasAttachment ? 4 : 0,
+                  ),
+                ),
+              ),
+              if (_contentHeight >= 80 && !widget.isFullContent)
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: IgnorePointer(
+                    child: Container(
+                      height: 80,
+                      decoration: BoxDecoration(
+                        gradient: LinearGradient(
+                          begin: Alignment.bottomCenter,
+                          end: Alignment.topCenter,
+                          colors: [
+                            Theme.of(context).colorScheme.surfaceContainerLow,
+                            Theme.of(context)
+                                .colorScheme
+                                .surface
+                                .withOpacity(0),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+            ],
           ),
           _buildFooter().paddingOnly(left: 16),
           if (attachments.isNotEmpty)
@@ -330,33 +377,47 @@ class _PostItemState extends State<PostItem> {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     _buildHeader(),
-                    SizedContainer(
-                      maxWidth: 640,
-                      maxHeight: widget.isFullContent ? double.infinity : 320,
-                      child: _MeasureSize(
-                        onChange: (size) {
-                          _contentHeight = size.height;
-                        },
-                        child: MarkdownTextContent(
-                          content: item.body['content'],
-                          isSelectable: widget.isContentSelectable,
-                        ).paddingOnly(left: 12, right: 8),
-                      ),
-                    ),
-                    if (_contentHeight >= 320 &&
-                        widget.isClickable &&
-                        !widget.isFullContent)
-                      InkWell(
-                        child: Text(
-                          'readMore'.tr,
-                          style: TextStyle(
-                            color: Theme.of(context).colorScheme.primary,
+                    _buildHeaderDivider(),
+                    Stack(
+                      children: [
+                        SizedContainer(
+                          maxWidth: 640,
+                          maxHeight:
+                              widget.isFullContent ? double.infinity : 320,
+                          child: _MeasureSize(
+                            onChange: (size) {
+                              setState(() => _contentHeight = size.height);
+                            },
+                            child: MarkdownTextContent(
+                              content: item.body['content'],
+                              isSelectable: widget.isContentSelectable,
+                            ).paddingOnly(left: 12, right: 8),
                           ),
                         ),
-                        onTap: () {
-                          openContainer();
-                        },
-                      ).paddingOnly(left: 12, top: 4),
+                        if (_contentHeight >= 320 && !widget.isFullContent)
+                          Align(
+                            alignment: Alignment.bottomCenter,
+                            child: IgnorePointer(
+                              child: Container(
+                                height: 320,
+                                decoration: BoxDecoration(
+                                  gradient: LinearGradient(
+                                    begin: Alignment.bottomCenter,
+                                    end: Alignment.topCenter,
+                                    colors: [
+                                      Theme.of(context).colorScheme.surface,
+                                      Theme.of(context)
+                                          .colorScheme
+                                          .surface
+                                          .withOpacity(0),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                      ],
+                    ),
                     if (widget.item.replyTo != null && widget.isShowEmbed)
                       _buildReply(context).paddingOnly(top: 4),
                     if (widget.item.repostTo != null && widget.isShowEmbed)

lib/widgets/posts/post_owned_list.dart

@@ -6,12 +6,14 @@ import 'package:solian/widgets/posts/post_item.dart';
 class PostOwnedListEntry extends StatelessWidget {
   final Post item;
   final Function onTap;
+  final bool isFullContent;
   final Color? backgroundColor;
 
   const PostOwnedListEntry({
     super.key,
     required this.item,
     required this.onTap,
+    this.isFullContent = false,
     this.backgroundColor,
   });
 
@@ -29,6 +31,7 @@ class PostOwnedListEntry extends StatelessWidget {
               isClickable: false,
               isShowReply: false,
               isReactable: false,
+              isFullContent: isFullContent,
               backgroundColor: backgroundColor,
             ).paddingSymmetric(vertical: 8),
           ],

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.1+4
+version: 1.2.1+6
 
 environment:
   sdk: ">=3.3.4 <4.0.0"