🚀 Launch 2.2.2+51

assets/translations/en-US.json

@@ -181,6 +181,8 @@
   "settingsAppearance": "Appearance",
   "settingsAppBarTransparent": "Transparent App Bar",
   "settingsAppBarTransparentDescription": "Enable transparent effect for the app bar.",
+  "settingsDrawerPreferCollapse": "Prefer Drawer Collapse",
+  "settingsDrawerPreferCollapseDescription": "Make the drawer to collapse even when the screen is wide enough.",
   "settingsBackgroundImage": "Background Image",
   "settingsBackgroundImageDescription": "Set the background image that will be applied globally.",
   "settingsBackgroundImageClear": "Clear Existing Background Image",

assets/translations/zh-CN.json

@@ -185,6 +185,8 @@
   "settingsThemeMaterial3Description": "将应用主题设置为 Material 3 设计范式的主题。",
   "settingsAppBarTransparent": "透明顶栏",
   "settingsAppBarTransparentDescription": "为顶栏启用透明效果。",
+  "settingsDrawerPreferCollapse": "侧边栏偏好折叠",
+  "settingsDrawerPreferCollapseDescription": "将侧边栏优先折叠，即使屏幕宽度足够大去放下整个侧边栏。",
   "settingsColorScheme": "主题色",
   "settingsColorSchemeDescription": "设置应用主题色。",
   "settingsColorSeed": "预设色彩主题",

assets/translations/zh-HK.json

@@ -185,6 +185,8 @@
   "settingsThemeMaterial3Description": "將應用主題設置為 Material 3 設計範式的主題。",
   "settingsAppBarTransparent": "透明頂欄",
   "settingsAppBarTransparentDescription": "為頂欄啓用透明效果。",
+  "settingsDrawerPreferCollapse": "側邊欄偏好摺疊",
+  "settingsDrawerPreferCollapseDescription": "將側邊欄優先摺疊，即使屏幕寬度足夠大去放下整個側邊欄。",
   "settingsColorScheme": "主題色",
   "settingsColorSchemeDescription": "設置應用主題色。",
   "settingsColorSeed": "預設色彩主題",

assets/translations/zh-TW.json

@@ -185,6 +185,8 @@
   "settingsThemeMaterial3Description": "將應用主題設置為 Material 3 設計範式的主題。",
   "settingsAppBarTransparent": "透明頂欄",
   "settingsAppBarTransparentDescription": "為頂欄啟用透明效果。",
+  "settingsDrawerPreferCollapse": "側邊欄偏好摺疊",
+  "settingsDrawerPreferCollapseDescription": "將側邊欄優先摺疊，即使屏幕寬度足夠大去放下整個側邊欄。",
   "settingsColorScheme": "主題色",
   "settingsColorSchemeDescription": "設置應用主題色。",
   "settingsColorSeed": "預設色彩主題",

lib/controllers/post_write_controller.dart

@@ -154,7 +154,10 @@ class PostWriteController extends ChangeNotifier {
   final TextEditingController descriptionController = TextEditingController();
   final TextEditingController aliasController = TextEditingController();
 
-  PostWriteController() {
+  bool _temporarySaveActive = false;
+
+  PostWriteController({bool doLoadFromTemporary = true}) {
+    _temporarySaveActive = doLoadFromTemporary;
     titleController.addListener(() {
       _temporaryPlanSave();
       notifyListeners();
@@ -166,7 +169,7 @@ class PostWriteController extends ChangeNotifier {
     contentController.addListener(() {
       _temporaryPlanSave();
     });
-    _temporaryLoad();
+    if (doLoadFromTemporary) _temporaryLoad();
   }
 
   String mode = kTitleMap.keys.first;
@@ -317,6 +320,7 @@ class PostWriteController extends ChangeNotifier {
   Timer? _temporarySaveTimer;
 
   void _temporaryPlanSave() {
+    if (!_temporarySaveActive) return;
     _temporarySaveTimer?.cancel();
     _temporarySaveTimer = Timer(const Duration(seconds: 1), () {
       _temporarySave();

lib/main.dart

@@ -258,6 +258,10 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
 
   Future<void> _initialize() async {
     try {
+      final cfg = context.read<ConfigProvider>();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        cfg.calcDrawerSize(context);
+      });
       final home = context.read<HomeWidgetProvider>();
       await home.initialize();
       if (!mounted) return;
@@ -298,6 +302,17 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return widget.child;
+    final cfg = context.read<ConfigProvider>();
+    return NotificationListener<SizeChangedLayoutNotification>(
+      onNotification: (notification) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          cfg.calcDrawerSize(context);
+        });
+        return false;
+      },
+      child: SizeChangedLayoutNotifier(
+        child: widget.child,
+      ),
+    );
   }
 }

lib/providers/config.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:responsive_framework/responsive_framework.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:surface/providers/widget.dart';
 
@@ -12,6 +13,7 @@ const kNetworkServerStoreKey = 'app_server_url';
 const kAppbarTransparentStoreKey = 'app_bar_transparent';
 const kAppBackgroundStoreKey = 'app_has_background';
 const kAppColorSchemeStoreKey = 'app_color_scheme';
+const kAppDrawerPreferCollapse = 'app_drawer_prefer_collapse';
 
 const Map<String, FilterQuality> kImageQualityLevel = {
   'settingsImageQualityLowest': FilterQuality.none,
@@ -33,6 +35,24 @@ class ConfigProvider extends ChangeNotifier {
     prefs = await SharedPreferences.getInstance();
   }
 
+  bool drawerIsCollapsed = false;
+  bool drawerIsExpanded = false;
+
+  void calcDrawerSize(BuildContext context) {
+    final rpb = ResponsiveBreakpoints.of(context);
+    final newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
+    final newDrawerIsExpanded = rpb.largerThan(TABLET)
+        ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
+            ? false
+            : true
+        : false;
+    if (newDrawerIsExpanded != drawerIsExpanded || newDrawerIsCollapsed != drawerIsCollapsed) {
+      drawerIsExpanded = newDrawerIsExpanded;
+      drawerIsCollapsed = newDrawerIsCollapsed;
+      notifyListeners();
+    }
+  }
+
   FilterQuality get imageQuality {
     return kImageQualityLevel.values.elementAtOrNull(prefs.getInt('app_image_quality') ?? 3) ?? FilterQuality.high;
   }

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(
+                            SelectionArea(
+                              child: MarkdownTextContent(
                                 content: nty.body,
                                 isAutoWarp: true,
-                              isSelectable: true,
+                              ),
                             ),
                             if ([
                                   'interactive.feedback',

lib/screens/post/post_editor.dart

@@ -54,7 +54,9 @@ class PostEditorScreen extends StatefulWidget {
 }
 
 class _PostEditorScreenState extends State<PostEditorScreen> {
-  final PostWriteController _writeController = PostWriteController();
+  late final PostWriteController _writeController = PostWriteController(
+    doLoadFromTemporary: widget.postEditId == null,
+  );
 
   bool _isFetching = false;
 

lib/screens/settings.dart

@@ -240,6 +240,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     setState(() {});
                   },
                 ),
+                CheckboxListTile(
+                  secondary: const Icon(Symbols.left_panel_close),
+                  title: Text('settingsDrawerPreferCollapse').tr(),
+                  subtitle: Text('settingsDrawerPreferCollapseDescription').tr(),
+                  contentPadding: const EdgeInsets.only(left: 24, right: 17),
+                  value: _prefs.getBool(kAppDrawerPreferCollapse) ?? false,
+                  onChanged: (value) {
+                    _prefs.setBool(kAppDrawerPreferCollapse, value ?? false);
+                    final cfg = context.read<ConfigProvider>();
+                    cfg.calcDrawerSize(context);
+                    setState(() {});
+                  },
+                ),
               ],
             ),
             Column(

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

@@ -150,7 +150,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,20 +186,73 @@ 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(
+          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'],
-            isSelectable: true,
               isAutoWarp: true,
             ),
+          ),
           if (data.updatedAt != data.createdAt)
             Text(
               'messageEditedHint'.tr(),

lib/widgets/context_menu.dart

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_context_menu/flutter_context_menu.dart';
-import 'package:responsive_framework/responsive_framework.dart';
+import 'package:provider/provider.dart';
+import 'package:surface/providers/config.dart';
 
 class ContextMenuArea extends StatelessWidget {
   final ContextMenu contextMenu;
@@ -22,11 +23,10 @@ class ContextMenuArea extends StatelessWidget {
     return Listener(
       onPointerDown: (event) {
         mousePosition = event.position;
-        final isCollapseDrawer = ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
+        final cfg = context.read<ConfigProvider>();
-        if (!isCollapseDrawer) {
+        if (!cfg.drawerIsCollapsed) {
-          final isExpandDrawer = ResponsiveBreakpoints.of(context).largerThan(TABLET);
           // Leave padding for side navigation
-          mousePosition = isExpandDrawer
+          mousePosition = cfg.drawerIsExpanded
               ? mousePosition.copyWith(dx: mousePosition.dx - 304 * 2)
               : mousePosition.copyWith(dx: mousePosition.dx - 72 * 2);
         }

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>[
@@ -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))
+              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/navigation/app_scaffold.dart

@@ -6,8 +6,10 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.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/connection_indicator.dart';
 import 'package:surface/widgets/dialog.dart';
@@ -57,10 +59,11 @@ class AppRootScaffold extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final cfg = context.watch<ConfigProvider>();
     final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
 
-    final isCollapseDrawer = ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
+    final isCollapseDrawer = cfg.drawerIsCollapsed;
-    final isExpandDrawer = ResponsiveBreakpoints.of(context).largerThan(TABLET);
+    final isExpandedDrawer = cfg.drawerIsExpanded;
 
     final routeName = GoRouter.of(context).routerDelegate.currentConfiguration.last.route.name;
     final isShowBottomNavigation = NavigationProvider.kShowBottomNavScreen.contains(routeName)
@@ -81,7 +84,7 @@ class AppRootScaffold extends StatelessWidget {
                     ),
                   ),
                 ),
-                child: isExpandDrawer ? AppNavigationDrawer(elevation: 0) : AppRailNavigation(),
+                child: isExpandedDrawer ? AppNavigationDrawer(elevation: 0) : AppRailNavigation(),
               ),
               Expanded(child: body),
             ],
@@ -147,7 +150,7 @@ class AppRootScaffold extends StatelessWidget {
             Expanded(child: innerWidget),
           ],
         ),
-        drawer: !isExpandDrawer ? AppNavigationDrawer() : null,
+        drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,
         drawerEdgeDragWidth: isPopable ? 0 : null,
         bottomNavigationBar: isShowBottomNavigation ? AppBottomNavigationBar() : null,
       ),

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(
+    final content = MarkdownTextContent(
-      isSelectable: isSelectable,
       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;
   }
 }
 

lib/widgets/post/post_mini_editor.dart

@@ -25,7 +25,7 @@ class PostMiniEditor extends StatefulWidget {
 }
 
 class _PostMiniEditorState extends State<PostMiniEditor> {
-  final PostWriteController _writeController = PostWriteController();
+  final PostWriteController _writeController = PostWriteController(doLoadFromTemporary: false);
 
   bool _isFetching = false;
 

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+51
 
 environment:
   sdk: ^3.5.4