🚀 Launch 2.2.2+52

lib/screens/chat.dart

@@ -236,7 +236,7 @@ class _ChatScreenState extends State<ChatScreen> {
                             'alias': channel.alias,
                           },
                         ).then((value) {
-                          if (value == true) _refreshChannels();
+                          if (mounted) _refreshChannels();
                         });
                       },
                     );

lib/screens/notification.dart

@@ -206,10 +206,11 @@ class _NotificationScreenState extends State<NotificationScreen> {
                                 style: Theme.of(context).textTheme.titleSmall,
                               ),
                             if (nty.subtitle != null) const Gap(4),
-                            MarkdownTextContent(
-                              content: nty.body,
-                              isAutoWarp: true,
-                              isSelectable: true,
+                            SelectionArea(
+                              child: MarkdownTextContent(
+                                content: nty.body,
+                                isAutoWarp: true,
+                              ),
                             ),
                             if ([
                                   'interactive.feedback',

lib/widgets/attachment/attachment_zoom.dart

@@ -329,7 +329,7 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
                               )
                             else
                               Text(
-                                '${item.size} Bytes',
+                                item.size.formatBytes(),
                                 style: metaTextStyle,
                               ),
                             if (item.metadata['width'] != null && item.metadata['height'] != null)

lib/widgets/chat/chat_message.dart

@@ -128,6 +128,9 @@ class ChatMessage extends StatelessWidget {
                           if (isCompact) const Gap(8),
                           if (data.preload?.quoteEvent != null)
                             StyledWidget(Container(
+                              constraints: BoxConstraints(
+                                maxWidth: 480,
+                              ),
                               decoration: BoxDecoration(
                                 borderRadius: const BorderRadius.all(Radius.circular(8)),
                                 border: Border.all(
@@ -150,7 +153,12 @@ class ChatMessage extends StatelessWidget {
                               ),
                             )).padding(bottom: 4, top: 4),
                           switch (data.type) {
-                            'messages.new' => _ChatMessageText(data: data),
+                            'messages.new' => _ChatMessageText(
+                                data: data,
+                                onReply: onReply,
+                                onEdit: onEdit,
+                                onDelete: onDelete,
+                              ),
                             _ => _ChatMessageSystemNotify(data: data),
                           },
                         ],
@@ -181,19 +189,72 @@ class ChatMessage extends StatelessWidget {
 
 class _ChatMessageText extends StatelessWidget {
   final SnChatMessage data;
+  final Function(SnChatMessage)? onReply;
+  final Function(SnChatMessage)? onEdit;
+  final Function(SnChatMessage)? onDelete;
 
-  const _ChatMessageText({required this.data});
+  const _ChatMessageText({required this.data, this.onReply, this.onEdit, this.onDelete});
 
   @override
   Widget build(BuildContext context) {
+    final ua = context.read<UserProvider>();
+
+    final isOwner = ua.isAuthorized && data.sender.accountId == ua.user?.id;
+
     if (data.body['text'] != null && data.body['text'].isNotEmpty) {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          MarkdownTextContent(
-            content: data.body['text'],
-            isSelectable: true,
-            isAutoWarp: true,
+          SelectionArea(
+            contextMenuBuilder: (context, editableTextState) {
+              final List<ContextMenuButtonItem> items = editableTextState.contextMenuButtonItems;
+
+              if (onReply != null) {
+                items.insert(
+                  0,
+                  ContextMenuButtonItem(
+                    label: 'reply'.tr(),
+                    onPressed: () {
+                      ContextMenuController.removeAny();
+                      onReply?.call(data);
+                    },
+                  ),
+                );
+              }
+              if (isOwner && onEdit != null) {
+                items.insert(
+                  1,
+                  ContextMenuButtonItem(
+                    label: 'edit'.tr(),
+                    onPressed: () {
+                      ContextMenuController.removeAny();
+                      onEdit?.call(data);
+                    },
+                  ),
+                );
+              }
+              if (isOwner && onDelete != null) {
+                items.insert(
+                  2,
+                  ContextMenuButtonItem(
+                    label: 'delete'.tr(),
+                    onPressed: () {
+                      ContextMenuController.removeAny();
+                      onDelete?.call(data);
+                    },
+                  ),
+                );
+              }
+
+              return AdaptiveTextSelectionToolbar.buttonItems(
+                anchors: editableTextState.contextMenuAnchors,
+                buttonItems: items,
+              );
+            },
+            child: MarkdownTextContent(
+              content: data.body['text'],
+              isAutoWarp: true,
+            ),
           ),
           if (data.updatedAt != data.createdAt)
             Text(

lib/widgets/chat/chat_message_input.dart

@@ -48,6 +48,8 @@ class ChatMessageInputState extends State<ChatMessageInput> {
 
   void setEdit(SnChatMessage? value) {
     _contentController.text = value?.body['text'] ?? '';
+    _attachments.clear();
+    _attachments.addAll(value?.preload?.attachments?.map((e) => PostWriteMedia(e)) ?? []);
     setState(() => _editingMessage = value);
   }
 
@@ -101,7 +103,9 @@ class ChatMessageInputState extends State<ChatMessageInput> {
           },
         );
 
-        _attachments[i] = PostWriteMedia(item);
+        setState(() {
+          _attachments[i] = PostWriteMedia(item);
+        });
       }
     } catch (err) {
       if (!mounted) return;
@@ -197,6 +201,7 @@ class ChatMessageInputState extends State<ChatMessageInput> {
                       InkWell(
                         child: Text('cancel'.tr()),
                         onTap: () {
+                          _attachments.clear();
                           setState(() => _replyingMessage = null);
                         },
                       ),
@@ -236,6 +241,7 @@ class ChatMessageInputState extends State<ChatMessageInput> {
                       InkWell(
                         child: Text('cancel'.tr()),
                         onTap: () {
+                          _attachments.clear();
                           _contentController.clear();
                           setState(() => _editingMessage = null);
                         },

lib/widgets/context_menu.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_context_menu/flutter_context_menu.dart';
 import 'package:provider/provider.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 import 'package:surface/providers/config.dart';
 
 class ContextMenuArea extends StatelessWidget {

lib/widgets/markdown_content.dart

@@ -17,7 +17,6 @@ import 'attachment/attachment_zoom.dart';
 
 class MarkdownTextContent extends StatelessWidget {
   final String content;
-  final bool isSelectable;
   final bool isAutoWarp;
   final bool isEnlargeSticker;
   final TextScaler? textScaler;
@@ -26,14 +25,14 @@ class MarkdownTextContent extends StatelessWidget {
   const MarkdownTextContent({
     super.key,
     required this.content,
-    this.isSelectable = false,
     this.isAutoWarp = false,
     this.isEnlargeSticker = false,
     this.textScaler,
     this.attachments,
   });
 
-  Widget _buildContent(BuildContext context) {
+  @override
+  Widget build(BuildContext context) {
     return Markdown(
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
@@ -68,8 +67,7 @@ class MarkdownTextContent extends StatelessWidget {
         ),
         code: GoogleFonts.robotoMono(height: 1),
       ),
-      builders: {
-      },
+      builders: {},
       softLineBreak: true,
       extensionSet: markdown.ExtensionSet(
         <markdown.BlockSyntax>[
@@ -144,7 +142,7 @@ class MarkdownTextContent extends StatelessWidget {
               );
             case 'attachments':
               final attachment = attachments?.firstWhere(
-                (ele) => ele?.rid == segments[1],
+                    (ele) => ele?.rid == segments[1],
                 orElse: () => null,
               );
               if (attachment != null) {
@@ -202,14 +200,6 @@ class MarkdownTextContent extends StatelessWidget {
       },
     );
   }
-
-  @override
-  Widget build(BuildContext context) {
-    if (isSelectable) {
-      return SelectionArea(child: _buildContent(context));
-    }
-    return _buildContent(context);
-  }
 }
 
 class _UserNameCardInlineSyntax extends markdown.InlineSyntax {

lib/widgets/navigation/app_drawer_navigation.dart

@@ -1,9 +1,13 @@
+import 'dart:io';
+
+import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
-import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
+import 'package:surface/providers/config.dart';
 import 'package:surface/providers/navigation.dart';
 import 'package:surface/widgets/version_label.dart';
 
@@ -28,8 +32,9 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
   @override
   Widget build(BuildContext context) {
     final nav = context.watch<NavigationProvider>();
+    final cfg = context.watch<ConfigProvider>();
 
-    final backgroundColor = ResponsiveBreakpoints.of(context).largerThan(TABLET) ? Colors.transparent : null;
+    final backgroundColor = cfg.drawerIsExpanded ? Colors.transparent : null;
 
     return ListenableBuilder(
       listenable: nav,
@@ -44,6 +49,18 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
           backgroundColor: backgroundColor,
           selectedIndex: nav.currentIndex,
           children: [
+            if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS) && !cfg.drawerIsExpanded)
+              Container(
+                decoration: BoxDecoration(
+                  border: Border(
+                    bottom: BorderSide(
+                      color: Theme.of(context).dividerColor,
+                      width: 1 / MediaQuery.of(context).devicePixelRatio,
+                    ),
+                  ),
+                ),
+                child: WindowTitleBarBox(),
+              ),
             Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,

lib/widgets/post/post_item.dart

@@ -879,13 +879,17 @@ class _PostContentBody extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (data.body['content'] == null) return const SizedBox.shrink();
-    return MarkdownTextContent(
-      isSelectable: isSelectable,
+    final content = MarkdownTextContent(
       isEnlargeSticker: true,
       textScaler: isEnlarge ? TextScaler.linear(1.1) : null,
       content: data.body['content'],
       attachments: data.preload?.attachments,
     );
+
+    if (isSelectable) {
+      return SelectionArea(child: content);
+    }
+    return content;
   }
 }
 

pubspec.lock

@@ -618,10 +618,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: c724234b05e378383e958f3e82ca84a3e1e3c06a0898462044dd8a24b1ee9864
+      sha256: "10ddaf334fe84d59333a12d153043e366f243e0bdfff2df0313e1e249f5bf926"
       url: "https://pub.dev"
     source: hosted
-    version: "0.70.0"
+    version: "0.70.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -822,10 +822,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539"
+      sha256: "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.6.2"
+    version: "14.6.3"
   google_fonts:
     dependency: "direct main"
     description:
@@ -2169,4 +2169,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"

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.2.2+49
+version: 2.2.2+52
 
 environment:
   sdk: ^3.5.4