🚀 Launch Feature Drop 2.4.2+80

assets/translations/en-US.json

@@ -207,6 +207,7 @@
     "one": "{} comment",
     "other": "{} comments"
   },
+  "postCommentExpand": "Show comments",
   "settingsAppearance": "Appearance",
   "settingsCustomFonts": "Custom Fonts",
   "settingsCustomFontsDescription": "Set custom fonts for the application.",
@@ -811,6 +812,8 @@
   "accountActionEvent": "Action Events",
   "accountActionEventDescription": "View your action event logs.",
   "eventMetadata": "Metadata",
+  "accountAuthTickets": "Auth Sessions",
+  "accountAuthTicketsDescription": "View and manage your auth sessions.",
   "authTicketCreatedAt": "Issued at {}",
   "authTicketExpiredAt": "Expired at {}",
   "authTicketLastGrantAt": "Last granted at {}",
@@ -837,5 +840,11 @@
   "fieldContactContent": "Contact method",
   "accountContactMethodsPublicHint": "This contact method will be displayed publicly on your profile.",
   "accountContactMethodsDelete": "Delete Contact Method",
-  "accountContactMethodsDeleteDescription": "Are you sure you want to delete contact method {}? This operation is irreversible."
+  "accountContactMethodsDeleteDescription": "Are you sure you want to delete contact method {}? This operation is irreversible.",
+  "postCommentAdd": "Write a comment",
+  "translate": "Translate",
+  "translating": "Translating…",
+  "translated": "Translated",
+  "settingsAutoTranslate": "Auto Translate",
+  "settingsAutoTranslateDescription": "Automatically translate text when viewing posts and messages."
 }

assets/translations/zh-CN.json

@@ -205,6 +205,7 @@
     "one": "{} 条评论",
     "other": "{} 条评论"
   },
+  "postCommentExpand": "展开评论",
   "settingsAppearance": "外观",
   "settingsCustomFonts": "自定义字体",
   "settingsCustomFontsDescription": "设置应用程序使用的字体。",
@@ -837,5 +838,11 @@
   "fieldContactContent": "联系方式",
   "accountContactMethodsPublicHint": "这个联系方式公开地显示在个人资料中。",
   "accountContactMethodsDelete": "删除联系方式",
-  "accountContactMethodsDeleteDescription": "你确定要删除联系方式 {} 吗？这个操作不可撤销。"
+  "accountContactMethodsDeleteDescription": "你确定要删除联系方式 {} 吗？这个操作不可撤销。",
+  "postCommentAdd": "撰写一条评论",
+  "translate": "翻译",
+  "translating": "正在翻译……",
+  "translated": "已翻译",
+  "settingsAutoTranslate": "自动翻译",
+  "settingsAutoTranslateDescription": "在查看帖子、消息时自动翻译文本。"
 }

assets/translations/zh-HK.json

@@ -205,6 +205,7 @@
     "one": "{} 條評論",
     "other": "{} 條評論"
   },
+  "postCommentExpand": "展開評論",
   "settingsAppearance": "外觀",
   "settingsCustomFonts": "自定義字體",
   "settingsCustomFontsDescription": "設置應用程序使用的字體。",
@@ -837,5 +838,11 @@
   "fieldContactContent": "聯繫方式",
   "accountContactMethodsPublicHint": "這個聯繫方式公開地顯示在個人資料中。",
   "accountContactMethodsDelete": "刪除聯繫方式",
-  "accountContactMethodsDeleteDescription": "你確定要刪除聯繫方式 {} 嗎？這個操作不可撤銷。"
+  "accountContactMethodsDeleteDescription": "你確定要刪除聯繫方式 {} 嗎？這個操作不可撤銷。",
+  "postCommentAdd": "撰寫一條評論",
+  "translate": "翻譯",
+  "translating": "正在翻譯……",
+  "translated": "已翻譯",
+  "settingsAutoTranslate": "自動翻譯",
+  "settingsAutoTranslateDescription": "在查看帖子、消息時自動翻譯文本。"
 }

assets/translations/zh-TW.json

@@ -205,6 +205,7 @@
     "one": "{} 條評論",
     "other": "{} 條評論"
   },
+  "postCommentExpand": "展開評論",
   "settingsAppearance": "外觀",
   "settingsCustomFonts": "自定義字體",
   "settingsCustomFontsDescription": "設置應用程序使用的字體。",
@@ -837,5 +838,11 @@
   "fieldContactContent": "聯繫方式",
   "accountContactMethodsPublicHint": "這個聯繫方式公開地顯示在個人資料中。",
   "accountContactMethodsDelete": "刪除聯繫方式",
-  "accountContactMethodsDeleteDescription": "你確定要刪除聯繫方式 {} 嗎？這個操作不可撤銷。"
+  "accountContactMethodsDeleteDescription": "你確定要刪除聯繫方式 {} 嗎？這個操作不可撤銷。",
+  "postCommentAdd": "撰寫一條評論",
+  "translate": "翻譯",
+  "translating": "正在翻譯……",
+  "translated": "已翻譯",
+  "settingsAutoTranslate": "自動翻譯",
+  "settingsAutoTranslateDescription": "在查看帖子、消息時自動翻譯文本。"
 }

lib/main.dart

@@ -37,6 +37,7 @@ import 'package:surface/providers/sn_realm.dart';
 import 'package:surface/providers/sn_sticker.dart';
 import 'package:surface/providers/special_day.dart';
 import 'package:surface/providers/theme.dart';
+import 'package:surface/providers/translation.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/providers/websocket.dart';
@@ -167,6 +168,7 @@ class SolianApp extends StatelessWidget {
             ChangeNotifierProvider(create: (ctx) => NotificationProvider(ctx)),
             ChangeNotifierProvider(create: (ctx) => ChatChannelProvider(ctx)),
             ChangeNotifierProvider(create: (ctx) => ChatCallProvider(ctx)),
+            Provider(create: (ctx) => SnTranslator()),
 
             // Additional helper layer
             Provider(create: (ctx) => SpecialDayProvider(ctx)),
@@ -274,7 +276,9 @@ class _AppSplashScreenState extends State<_AppSplashScreen> with TrayListener {
           mounted) {
         final config = context.read<ConfigProvider>();
         config.setUpdate(
-            remoteVersionString, resp.data?['body'] ?? 'No changelog');
+          remoteVersionString,
+          resp.data?['body'] ?? 'No changelog',
+        );
         logging.info("[Update] Update available: $remoteVersionString");
       }
     } catch (e) {

lib/providers/config.dart

@@ -20,6 +20,7 @@ const kAppExpandChatLink = 'app_expand_chat_link';
 const kAppRealmCompactView = 'app_realm_compact_view';
 const kAppCustomFonts = 'app_custom_fonts';
 const kAppMixedFeed = 'app_mixed_feed';
+const kAppAutoTranslate = 'app_auto_translate';
 
 const Map<String, FilterQuality> kImageQualityLevel = {
   'settingsImageQualityLowest': FilterQuality.none,
@@ -86,6 +87,15 @@ class ConfigProvider extends ChangeNotifier {
     return prefs.getBool(kAppMixedFeed) ?? true;
   }
 
+  bool get autoTranslate {
+    return prefs.getBool(kAppAutoTranslate) ?? false;
+  }
+
+  set autoTranslate(bool value) {
+    prefs.setBool(kAppAutoTranslate, value);
+    notifyListeners();
+  }
+
   set mixedFeed(bool value) {
     prefs.setBool(kAppMixedFeed, value);
     notifyListeners();

lib/providers/translation.dart

@@ -0,0 +1,56 @@
+import 'dart:convert';
+
+import 'package:crypto/crypto.dart';
+import 'package:dio/dio.dart';
+import 'package:surface/logger.dart';
+
+// TODO self host translate api
+const kTranslateApiBaseUrl = 'https://translate.disroot.org';
+
+class SnTranslator {
+  final Dio client = Dio(
+    BaseOptions(
+      baseUrl: kTranslateApiBaseUrl,
+      connectTimeout: Duration(seconds: 3),
+      sendTimeout: Duration(seconds: 3),
+      receiveTimeout: Duration(seconds: 3),
+    ),
+  );
+
+  final Map<String, String> _cache = {};
+
+  Future<String> translate(
+    String text, {
+    required String to,
+    String from = 'auto',
+    bool skipCache = false,
+  }) async {
+    if (text.isEmpty) return text;
+
+    final cacheKey = md5.convert(utf8.encode('$text$from$to')).toString();
+    if (!skipCache && _cache.containsKey(cacheKey)) {
+      return _cache[cacheKey]!;
+    }
+
+    logging.info('[Translator] Translate $text from $from to $to');
+
+    final resp = await client.post(
+      '/translate',
+      data: {
+        'q': text,
+        'source': from,
+        'target': to,
+        'format': 'text',
+      },
+    );
+    if (resp.statusCode == 200) {
+      final out = resp.data['translatedText'];
+      if (out.isNotEmpty) {
+        logging.info('[Translator] Translated $text from $from to $to');
+        _cache[cacheKey] = out;
+        return out;
+      }
+    }
+    throw Exception('translate failed: $resp');
+  }
+}

lib/screens/account/prefs/notify.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:surface/widgets/navigation/app_scaffold.dart';
+
+class AccountNotifyPrefsScreen extends StatelessWidget {
+  const AccountNotifyPrefsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AppScaffold();
+  }
+}

lib/screens/explore.dart

@@ -551,12 +551,18 @@ class _PostListWidgetState extends State<_PostListWidget> {
                   maxWidth: 640,
                 );
               case 'reader.news':
-                return NewsFeedEntry(data: ele);
+                return Container(
+                  constraints: BoxConstraints(maxWidth: 640),
+                  child: NewsFeedEntry(data: ele),
+                );
               default:
-                return FeedUnknownEntry(data: ele);
+                return Container(
+                  constraints: BoxConstraints(maxWidth: 640),
+                  child: FeedUnknownEntry(data: ele),
+                );
             }
           },
-          separatorBuilder: (_, __) => const Gap(8),
+          separatorBuilder: (_, __) => const Divider().padding(vertical: 2),
         ),
       ),
     );

lib/screens/settings.dart

@@ -387,6 +387,18 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     .fontSize(17)
                     .tr()
                     .padding(horizontal: 20, bottom: 4),
+                CheckboxListTile(
+                  secondary: const Icon(Symbols.translate),
+                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                  title: Text('settingsAutoTranslate').tr(),
+                  subtitle: Text('settingsAutoTranslateDescription').tr(),
+                  value: _prefs.getBool(kAppAutoTranslate) ?? false,
+                  onChanged: (value) {
+                    setState(() {
+                      _prefs.setBool(kAppAutoTranslate, value ?? false);
+                    });
+                  },
+                ),
                 CheckboxListTile(
                   secondary: const Icon(Symbols.vibration),
                   contentPadding: const EdgeInsets.only(left: 24, right: 17),

lib/widgets/account/account_image.dart

@@ -14,6 +14,7 @@ class AccountImage extends StatelessWidget {
   final Widget? fallbackWidget;
   final Widget? badge;
   final Offset? badgeOffset;
+  final FilterQuality? filterQuality;
 
   const AccountImage({
     super.key,
@@ -25,6 +26,7 @@ class AccountImage extends StatelessWidget {
     this.fallbackWidget,
     this.badge,
     this.badgeOffset,
+    this.filterQuality,
   });
 
   @override
@@ -54,6 +56,7 @@ class AccountImage extends StatelessWidget {
                   )
                 : AutoResizeUniversalImage(
                     sn.getAttachmentUrl(url),
+                    filterQuality: filterQuality,
                     key: Key('attachment-${content.hashCode}'),
                     fit: BoxFit.cover,
                   ),

lib/widgets/attachment/attachment_item.dart

@@ -45,11 +45,25 @@ class AttachmentItem extends StatelessWidget {
       case 'image':
         return Hero(
           tag: 'attachment-${data!.rid}-$tag',
-          child: AutoResizeUniversalImage(
+          child: Stack(
-            sn.getAttachmentUrl(data!.rid),
+            fit: StackFit.expand,
-            key: Key('attachment-${data!.rid}-$tag'),
+            children: [
-            fit: fit,
+              ImageFiltered(
-            filterQuality: filterQuality,
+                imageFilter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+                child: AutoResizeUniversalImage(
+                  sn.getAttachmentUrl(data!.rid),
+                  key: Key('attachment-${data!.rid}-$tag-blur-background'),
+                  fit: BoxFit.cover,
+                  filterQuality: filterQuality,
+                ),
+              ),
+              AutoResizeUniversalImage(
+                sn.getAttachmentUrl(data!.rid),
+                key: Key('attachment-${data!.rid}-$tag'),
+                fit: fit,
+                filterQuality: filterQuality,
+              ),
+            ],
           ),
         );
       case 'video':

lib/widgets/chat/chat_message.dart

@@ -10,6 +10,7 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/config.dart';
 import 'package:surface/providers/keypair.dart';
+import 'package:surface/providers/translation.dart';
 import 'package:surface/providers/user_directory.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/chat.dart';
@@ -18,6 +19,7 @@ import 'package:surface/widgets/account/account_popover.dart';
 import 'package:surface/widgets/account/badge.dart';
 import 'package:surface/widgets/attachment/attachment_list.dart';
 import 'package:surface/widgets/context_menu.dart';
+import 'package:surface/widgets/dialog.dart';
 import 'package:surface/widgets/link_preview.dart';
 import 'package:surface/widgets/markdown_content.dart';
 import 'package:flutter_animate/flutter_animate.dart';
@@ -228,7 +230,7 @@ class ChatMessage extends StatelessWidget {
   }
 }
 
-class _ChatMessageText extends StatelessWidget {
+class _ChatMessageText extends StatefulWidget {
   final SnChatMessage data;
   final Function(SnChatMessage)? onReply;
   final Function(SnChatMessage)? onEdit;
@@ -237,13 +239,56 @@ class _ChatMessageText extends StatelessWidget {
   const _ChatMessageText(
       {required this.data, this.onReply, this.onEdit, this.onDelete});
 
+  @override
+  State<_ChatMessageText> createState() => _ChatMessageTextState();
+}
+
+class _ChatMessageTextState extends State<_ChatMessageText> {
+  late String _displayText = widget.data.body['text'] ?? '';
+  bool _isTranslated = false;
+  bool _isTranslating = false;
+
+  Future<void> _translateText() async {
+    if (widget.data.body['text'] == null || widget.data.body['text']!.isEmpty) {
+      return;
+    }
+    final ta = context.read<SnTranslator>();
+    setState(() => _isTranslating = true);
+    try {
+      final to = EasyLocalization.of(context)!.locale.languageCode;
+      _displayText = await ta.translate(
+        widget.data.body['text'],
+        to: to,
+      );
+      _isTranslated = true;
+      if (mounted) setState(() {});
+    } catch (err) {
+      if (mounted) context.showErrorDialog(err);
+    } finally {
+      setState(() => _isTranslating = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    final cfg = context.read<ConfigProvider>();
+    if (cfg.autoTranslate) {
+      Future.delayed(const Duration(milliseconds: 100), () {
+        _translateText();
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final ua = context.read<UserProvider>();
 
-    final isOwner = ua.isAuthorized && data.sender.accountId == ua.user?.id;
+    final isOwner =
+        ua.isAuthorized && widget.data.sender.accountId == ua.user?.id;
 
-    if (data.body['text'] != null && data.body['text'].isNotEmpty) {
+    if (widget.data.body['text'] != null &&
+        widget.data.body['text'].isNotEmpty) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -252,38 +297,50 @@ class _ChatMessageText extends StatelessWidget {
               final List<ContextMenuButtonItem> items =
                   editableTextState.contextMenuButtonItems;
 
-              if (onReply != null) {
+              if (widget.onReply != null) {
                 items.insert(
                   0,
                   ContextMenuButtonItem(
                     label: 'reply'.tr(),
                     onPressed: () {
                       ContextMenuController.removeAny();
-                      onReply?.call(data);
+                      widget.onReply?.call(widget.data);
                     },
                   ),
                 );
               }
-              if (isOwner && onEdit != null) {
+              if (isOwner && widget.onEdit != null) {
                 items.insert(
                   1,
                   ContextMenuButtonItem(
                     label: 'edit'.tr(),
                     onPressed: () {
                       ContextMenuController.removeAny();
-                      onEdit?.call(data);
+                      widget.onEdit?.call(widget.data);
                     },
                   ),
                 );
               }
-              if (isOwner && onDelete != null) {
+              if (isOwner && widget.onDelete != null) {
                 items.insert(
                   2,
                   ContextMenuButtonItem(
                     label: 'delete'.tr(),
                     onPressed: () {
                       ContextMenuController.removeAny();
-                      onDelete?.call(data);
+                      widget.onDelete?.call(widget.data);
+                    },
+                  ),
+                );
+              }
+              if (widget.data.body['algorithm'] == 'plain') {
+                items.insert(
+                  3,
+                  ContextMenuButtonItem(
+                    label: 'translate'.tr(),
+                    onPressed: () {
+                      ContextMenuController.removeAny();
+                      _translateText();
                     },
                   ),
                 );
@@ -294,26 +351,47 @@ class _ChatMessageText extends StatelessWidget {
                 buttonItems: items,
               );
             },
-            child: switch (data.body['algorithm']) {
+            child: switch (widget.data.body['algorithm']) {
-              'rsa' => _ChatDecryptMessage(message: data),
+              'rsa' => _ChatDecryptMessage(message: widget.data),
               _ => MarkdownTextContent(
-                  content: data.body['text'],
+                  content: _displayText,
                   isAutoWarp: true,
-                  isEnlargeSticker:
+                  isEnlargeSticker: RegExp(r"^:([-\w]+):$")
-                      RegExp(r"^:([-\w]+):$").hasMatch(data.body['text'] ?? ''),
+                      .hasMatch(widget.data.body['text'] ?? ''),
                 ),
             },
           ),
-          if (data.updatedAt != data.createdAt)
+          if (widget.data.updatedAt != widget.data.createdAt)
             Text('messageEditedHint'.tr()).fontSize(13).opacity(0.75),
+          if (_isTranslating)
+            AnimateWidgetExtensions(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: Text('translated').tr().opacity(0.75),
+              onTap: () {
+                setState(() {
+                  _displayText = widget.data.body['text'] ?? '';
+                  _isTranslated = false;
+                });
+              },
+            ),
         ],
       );
-    } else if (data.body['attachments']?.isNotEmpty) {
+    } else if (widget.data.body['attachments']?.isNotEmpty) {
       return Row(
         children: [
           const Icon(Symbols.file_present, size: 20),
           const Gap(4),
-          Text('messageFileHint'.plural(data.body['attachments']!.length)),
+          Text('messageFileHint'
+              .plural(widget.data.body['attachments']!.length)),
         ],
       ).opacity(0.8);
     }

lib/widgets/post/post_comment_list.dart

@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/post.dart';
+import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/post.dart';
 import 'package:surface/widgets/dialog.dart';
@@ -14,14 +15,13 @@ import 'package:surface/widgets/post/post_item.dart';
 import 'package:surface/widgets/post/post_mini_editor.dart';
 import 'package:very_good_infinite_list/very_good_infinite_list.dart';
 
-import '../../providers/sn_network.dart';
-
 class PostCommentQuickAction extends StatelessWidget {
   final double? maxWidth;
   final SnPost parentPost;
   final Function? onPosted;
 
-  const PostCommentQuickAction({super.key, this.maxWidth, required this.parentPost, this.onPosted});
+  const PostCommentQuickAction(
+      {super.key, this.maxWidth, required this.parentPost, this.onPosted});
 
   @override
   Widget build(BuildContext context) {
@@ -30,7 +30,9 @@ class PostCommentQuickAction extends StatelessWidget {
     return Container(
       height: 240,
       constraints: BoxConstraints(maxWidth: maxWidth ?? double.infinity),
-      margin: ResponsiveBreakpoints.of(context).largerThan(MOBILE) ? const EdgeInsets.symmetric(vertical: 8) : EdgeInsets.zero,
+      margin: ResponsiveBreakpoints.of(context).largerThan(MOBILE)
+          ? const EdgeInsets.symmetric(vertical: 8)
+          : EdgeInsets.zero,
       decoration: BoxDecoration(
         borderRadius: ResponsiveBreakpoints.of(context).largerThan(MOBILE)
             ? const BorderRadius.all(Radius.circular(8))
@@ -99,7 +101,8 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
   Future<void> _selectAnswer(SnPost answer) async {
     try {
       final sn = context.read<SnNetworkProvider>();
-      await sn.client.put('/cgi/co/questions/${widget.parentPost.id}/answer', data: {
+      await sn.client
+          .put('/cgi/co/questions/${widget.parentPost.id}/answer', data: {
         'publisher': answer.publisherId,
         'answer_id': answer.id,
       });
@@ -135,7 +138,10 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
           child: PostItem(
             data: _posts[idx],
             maxWidth: widget.maxWidth,
-            onSelectAnswer: widget.parentPost.type == 'question' ? () => _selectAnswer(_posts[idx]) : null,
+            showExpandableComments: true,
+            onSelectAnswer: widget.parentPost.type == 'question'
+                ? () => _selectAnswer(_posts[idx])
+                : null,
             onChanged: (data) {
               setState(() => _posts[idx] = data);
             },
@@ -153,7 +159,8 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
           },
         );
       },
-      separatorBuilder: (context, index) => const Divider(height: 1),
+      separatorBuilder: (context, index) =>
+          const Divider().padding(vertical: 2),
     );
   }
 }
@@ -161,11 +168,13 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
 class PostCommentListPopup extends StatefulWidget {
   final SnPost post;
   final int commentCount;
+  final int depth;
 
   const PostCommentListPopup({
     super.key,
     required this.post,
     this.commentCount = 0,
+    this.depth = 1,
   });
 
   @override
@@ -180,48 +189,54 @@ class _PostCommentListPopupState extends State<PostCommentListPopup> {
     final ua = context.watch<UserProvider>();
     final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
 
-    return Column(
+    return SizedBox(
-      crossAxisAlignment: CrossAxisAlignment.start,
+      height: MediaQuery.of(context).size.height * 0.85,
-      children: [
+      child: Column(
-        Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
-          children: [
+          Row(
-            const Icon(Symbols.comment, size: 24),
+            crossAxisAlignment: CrossAxisAlignment.center,
-            const Gap(16),
+            children: [
-            Text('postCommentsDetailed').plural(widget.commentCount).textStyle(Theme.of(context).textTheme.titleLarge!),
+              const Icon(Symbols.comment, size: 24),
-          ],
+              const Gap(16),
-        ).padding(horizontal: 20, top: 16, bottom: 12),
+              Text('postCommentsDetailed')
-        Expanded(
+                  .plural(widget.commentCount)
-          child: CustomScrollView(
+                  .textStyle(Theme.of(context).textTheme.titleLarge!),
-            slivers: [
+            ],
-              if (ua.isAuthorized)
+          ).padding(horizontal: 20, top: 16, bottom: 12),
-                SliverToBoxAdapter(
+          Expanded(
-                  child: Container(
+            child: CustomScrollView(
-                    height: 240,
+              slivers: [
-                    decoration: BoxDecoration(
+                if (ua.isAuthorized)
-                      border: Border.symmetric(
+                  SliverToBoxAdapter(
-                        horizontal: BorderSide(
+                    child: Container(
-                          color: Theme.of(context).dividerColor,
+                      margin: const EdgeInsets.only(bottom: 8),
-                          width: 1 / devicePixelRatio,
+                      height: 240,
+                      decoration: BoxDecoration(
+                        border: Border.symmetric(
+                          horizontal: BorderSide(
+                            color: Theme.of(context).dividerColor,
+                            width: 1 / devicePixelRatio,
+                          ),
                         ),
                       ),
-                    ),
+                      child: PostMiniEditor(
-                    child: PostMiniEditor(
+                        postReplyId: widget.post.id,
-                      postReplyId: widget.post.id,
+                        onPost: () {
-                      onPost: () {
+                          _childListKey.currentState!.refresh();
-                        _childListKey.currentState!.refresh();
+                        },
-                      },
+                      ),
                     ),
                   ),
+                PostCommentSliverList(
+                  parentPost: widget.post,
+                  key: _childListKey,
                 ),
-              PostCommentSliverList(
+              ],
-                parentPost: widget.post,
+            ),
-                key: _childListKey,
-              ),
-            ],
           ),
-        ),
+        ],
-      ],
+      ),
     );
   }
 }

lib/widgets/post/post_poll.dart

@@ -80,59 +80,64 @@ class _PostPollState extends State<PostPoll> {
 
   @override
   Widget build(BuildContext context) {
-    return Card(
+    return LayoutBuilder(
-      margin: EdgeInsets.zero,
+      builder: (context, constraints) {
-      child: Column(
+        return Card(
-        children: [
+          margin: EdgeInsets.zero,
-          for (final option in _poll.options)
+          child: Column(
-            Stack(
+            children: [
-              children: [
+              for (final option in _poll.options)
-                ClipRRect(
+                Stack(
-                  borderRadius: const BorderRadius.all(Radius.circular(8)),
+                  children: [
-                  child: Container(
+                    ClipRRect(
-                    height: 60,
+                      borderRadius: const BorderRadius.all(Radius.circular(8)),
-                    width: MediaQuery.of(context).size.width *
+                      child: Container(
-                        (_poll.metric.byOptionsPercentage[option.id] ?? 0)
+                        height: 60,
-                            .toDouble(),
+                        width: constraints.maxWidth *
-                    color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                            (_poll.metric.byOptionsPercentage[option.id] ?? 0)
-                  ),
+                                .toDouble(),
-                ),
+                        color:
-                ListTile(
+                            Theme.of(context).colorScheme.surfaceContainerHigh,
-                  shape: RoundedRectangleBorder(
+                      ),
-                    borderRadius: BorderRadius.circular(8),
+                    ),
-                  ),
+                    ListTile(
-                  minTileHeight: 60,
+                      shape: RoundedRectangleBorder(
-                  leading: _answeredChoice == option.id
+                        borderRadius: BorderRadius.circular(8),
-                      ? const Icon(Symbols.circle, fill: 1)
+                      ),
-                      : const Icon(Symbols.circle),
+                      minTileHeight: 60,
-                  title: Text(option.name),
+                      leading: _answeredChoice == option.id
-                  subtitle: Column(
+                          ? const Icon(Symbols.circle, fill: 1)
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                          : const Icon(Symbols.circle),
-                    mainAxisSize: MainAxisSize.min,
+                      title: Text(option.name),
-                    children: [
+                      subtitle: Column(
-                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          Text(
+                          Row(
-                            'pollVotes'
+                            mainAxisSize: MainAxisSize.min,
-                                .plural(_poll.metric.byOptions[option.id] ?? 0),
+                            children: [
-                          ),
+                              Text(
-                          Text(' · ').padding(horizontal: 4),
+                                'pollVotes'.plural(
-                          Text(
+                                    _poll.metric.byOptions[option.id] ?? 0),
-                            '${((_poll.metric.byOptionsPercentage[option.id] ?? 0).toDouble() * 100).toStringAsFixed(2)}%',
+                              ),
+                              Text(' · ').padding(horizontal: 4),
+                              Text(
+                                '${((_poll.metric.byOptionsPercentage[option.id] ?? 0).toDouble() * 100).toStringAsFixed(2)}%',
+                              ),
+                            ],
                           ),
+                          if (option.description.isNotEmpty)
+                            Text(option.description),
                         ],
                       ),
-                      if (option.description.isNotEmpty)
+                      onTap: _isBusy ? null : () => _voteForOption(option),
-                        Text(option.description),
+                    ),
-                    ],
+                  ],
-                  ),
+                )
-                  onTap: _isBusy ? null : () => _voteForOption(option),
+            ],
-                ),
+          ),
-              ],
+        );
-            )
+      },
-        ],
-      ),
     );
   }
 }

macos/Podfile.lock

@@ -90,8 +90,6 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
-  - geolocator_apple (1.2.0):
-    - FlutterMacOS
   - GoogleAppMeasurement (11.8.0):
     - GoogleAppMeasurement/AdIdSupport (= 11.8.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -148,7 +146,7 @@ PODS:
     - HotKey
   - in_app_review (2.0.0):
     - FlutterMacOS
-  - livekit_client (2.4.0):
+  - livekit_client (2.4.1):
     - flutter_webrtc
     - FlutterMacOS
     - WebRTC-SDK (= 125.6422.06)
@@ -232,7 +230,6 @@ DEPENDENCIES:
   - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - gal (from `Flutter/ephemeral/.symlinks/plugins/gal/darwin`)
-  - geolocator_apple (from `Flutter/ephemeral/.symlinks/plugins/geolocator_apple/macos`)
   - hotkey_manager_macos (from `Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos`)
   - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
   - livekit_client (from `Flutter/ephemeral/.symlinks/plugins/livekit_client/macos`)
@@ -307,8 +304,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral
   gal:
     :path: Flutter/ephemeral/.symlinks/plugins/gal/darwin
-  geolocator_apple:
-    :path: Flutter/ephemeral/.symlinks/plugins/geolocator_apple/macos
   hotkey_manager_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos
   in_app_review:
@@ -372,14 +367,13 @@ SPEC CHECKSUMS:
   flutter_webrtc: d55fd3f5c75b42940b6b4b2cf376a5797398d1f8
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   gal: 6a522c75909f1244732d4596d11d6a2f86ff37a5
-  geolocator_apple: 72a78ae3f3e4ec0db62117bd93e34523f5011d58
   GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
   hotkey_manager_macos: 1e2edb0c7ae4fe67108af44a9d3445de41404160
   in_app_review: a6a031b9acd03c7d103e341aa334adf2c493fb93
-  livekit_client: 2e766be2c3ee6274a8e2633b356b98b5eb842987
+  livekit_client: d03409f83df069a1bb00a4c8dc78c54fb2287262
   local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
   media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82
   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5

pubspec.lock

@@ -314,7 +314,7 @@ packages:
     source: hosted
     version: "0.3.4+2"
   crypto:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: crypto
       sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"

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+79
+version: 2.4.2+80
 
 environment:
   sdk: ^3.5.4
@@ -142,6 +142,7 @@ dependencies:
   flutter_blurhash: ^0.8.2
   timelines_plus: ^1.0.6
   latlong2: ^0.9.1
+  crypto: ^3.0.6
 
 dev_dependencies:
   flutter_test: