✨ Able to prefer sidebar to collapse

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/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/theme.dart

@@ -48,7 +48,7 @@ Future<ThemeData> createAppTheme(
     appBarTheme: AppBarTheme(
       centerTitle: true,
       elevation: hasAppBarBlurry ? 0 : null,
-      backgroundColor: hasAppBarBlurry ? colorScheme.surfaceContainer.withAlpha(200) : colorScheme.primary,
+      backgroundColor: hasAppBarBlurry ? colorScheme.primary.withOpacity(0.3) : colorScheme.primary,
       foregroundColor: hasAppBarBlurry ? colorScheme.onSurface : colorScheme.onPrimary,
     ),
     scaffoldBackgroundColor: Colors.transparent,

lib/widgets/chat/chat_message.dart

@@ -124,7 +124,7 @@ class ChatMessage extends StatelessWidget {
                                   dateFormatter.format(data.createdAt.toLocal()),
                                 ).fontSize(13),
                               ],
-                            ),
+                            ).height(21),
                           if (isCompact) const Gap(8),
                           if (data.preload?.quoteEvent != null)
                             StyledWidget(Container(

lib/widgets/context_menu.dart

@@ -1,7 +1,9 @@
 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 {
   final ContextMenu contextMenu;
@@ -22,11 +24,10 @@ class ContextMenuArea extends StatelessWidget {
     return Listener(
       onPointerDown: (event) {
         mousePosition = event.position;
-        final isCollapseDrawer = ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
-        if (!isCollapseDrawer) {
-          final isExpandDrawer = ResponsiveBreakpoints.of(context).largerThan(TABLET);
+        final cfg = context.read<ConfigProvider>();
+        if (!cfg.drawerIsCollapsed) {
           // 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/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 isExpandDrawer = ResponsiveBreakpoints.of(context).largerThan(TABLET);
+    final isCollapseDrawer = cfg.drawerIsCollapsed;
+    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

@@ -113,7 +113,7 @@ class PostItem extends StatelessWidget {
         sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
       );
     } else {
-      await FileSaver.instance.saveFile(name: 'Solar Network Post #${data.id}', file: imageFile);
+      await FileSaver.instance.saveFile(name: 'Solar Network Post #${data.id}.png', file: imageFile);
     }
 
     await imageFile.delete();

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;
 

lib/widgets/universal_image.dart

@@ -55,17 +55,20 @@ class UniversalImage extends StatelessWidget {
           ? null
           : (BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {
               if (loadingProgress == null) return child;
-              return Center(
-                child: TweenAnimationBuilder(
-                  tween: Tween(
-                    begin: 0,
-                    end: loadingProgress.expectedTotalBytes != null
-                        ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes!
-                        : 0,
-                  ),
-                  duration: const Duration(milliseconds: 300),
-                  builder: (context, value, _) => CircularProgressIndicator(
-                    value: loadingProgress.expectedTotalBytes != null ? value.toDouble() : null,
+              return Container(
+                constraints: BoxConstraints(maxHeight: 80),
+                child: Center(
+                  child: TweenAnimationBuilder(
+                    tween: Tween(
+                      begin: 0,
+                      end: loadingProgress.expectedTotalBytes != null
+                          ? loadingProgress.cumulativeBytesLoaded / loadingProgress.expectedTotalBytes!
+                          : 0,
+                    ),
+                    duration: const Duration(milliseconds: 300),
+                    builder: (context, value, _) => CircularProgressIndicator(
+                      value: loadingProgress.expectedTotalBytes != null ? value.toDouble() : null,
+                    ),
                   ),
                 ),
               );

pubspec.lock

@@ -700,10 +700,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "255b00afa1a7bad19727da6a7780cf3db6c3c12e68d302d85e0ff1fdf173db9e"
+      sha256: e37f4c69a07b07bb92622ef6b131a53c9aae48f64b176340af9e8e5238718487
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4+3"
+    version: "0.7.5"
   flutter_native_splash:
     dependency: "direct dev"
     description:

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