fix: macos titlebar with recent macos and move window size code (#1376)

Author: Feichtmeier

lib/app/app_model.dart

@@ -110,7 +110,7 @@ class AppModel extends SafeChangeNotifier {
     _updateAvailable == null;
     notifyListeners();
 
-    if (!_allowManualUpdates || !isOnline) {
+    if (!isOnline) {
       _updateAvailable = false;
       notifyListeners();
       return Future.value();
@@ -122,7 +122,7 @@ class AppModel extends SafeChangeNotifier {
     final onlineVersion = getExtendedVersionNumber(_onlineVersion) ?? 0;
     final currentVersion = getExtendedVersionNumber(version) ?? 0;
     if (onlineVersion > currentVersion) {
-      _updateAvailable = true;
+      _updateAvailable = _allowManualUpdates && true;
     } else {
       _updateAvailable = false;
     }

lib/app/window_size_to_settings_listener.dart

@@ -1,24 +1,45 @@
 import 'dart:async';
 import 'dart:ui';
 
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:window_manager/window_manager.dart';
 
+import '../extensions/shared_preferences_x.dart';
 import '../extensions/taget_platform_x.dart';
 
 class WindowSizeToSettingsListener implements WindowListener {
-  WindowSizeToSettingsListener({
-    required Future<void> Function(Size value) onResize,
-    required Future<void> Function(bool value) onMaximize,
-    required Future<void> Function(bool value) onFullscreen,
-  }) : _onResize = onResize,
-       _onMaximize = onMaximize,
-       _onFullscreen = onFullscreen;
-
-  final Future<void> Function(Size value) _onResize;
-  final Future<void> Function(bool value) _onMaximize;
-  final Future<void> Function(bool value) _onFullscreen;
+  WindowSizeToSettingsListener({required SharedPreferences sharedPreferences})
+    : _sp = sharedPreferences;
+
+  final SharedPreferences _sp;
+
+  static Future<WindowSizeToSettingsListener> register({
+    required SharedPreferences sharedPreferences,
+    required WindowManager windowManager,
+  }) async {
+    final wm = windowManager;
+    final sp = sharedPreferences;
+    if (sp.getBool(SPKeys.saveWindowSize) == null) {
+      await sp.setBool(SPKeys.saveWindowSize, true);
+    }
 
-  Timer? _debounce;
+    if (sp.getBool(SPKeys.windowFullscreen) ?? false) {
+      await wm.setFullScreen(true);
+    } else if (sp.getBool(SPKeys.windowMaximized) ?? false) {
+      await wm.maximize();
+    } else {
+      final height = sp.getInt(SPKeys.windowHeight) ?? 820;
+      final width = sp.getInt(SPKeys.windowWidth) ?? 950;
+      await wm.setSize(Size(width.toDouble(), height.toDouble()));
+    }
+
+    final windowSizeToSettingsListener = WindowSizeToSettingsListener(
+      sharedPreferences: sp,
+    );
+    wm.addListener(windowSizeToSettingsListener);
+
+    return windowSizeToSettingsListener;
+  }
 
   @override
   void onWindowBlur() {}
@@ -30,7 +51,7 @@ class WindowSizeToSettingsListener implements WindowListener {
   void onWindowDocked() {}
 
   @override
-  void onWindowEnterFullScreen() => _onFullscreen(true);
+  void onWindowEnterFullScreen() => _sp.setBool(SPKeys.windowFullscreen, true);
 
   @override
   void onWindowEvent(String eventName) {}
@@ -39,10 +60,10 @@ class WindowSizeToSettingsListener implements WindowListener {
   void onWindowFocus() {}
 
   @override
-  void onWindowLeaveFullScreen() => _onFullscreen(false);
+  void onWindowLeaveFullScreen() => _sp.setBool(SPKeys.windowFullscreen, false);
 
   @override
-  void onWindowMaximize() => _onMaximize(true);
+  void onWindowMaximize() => _sp.setBool(SPKeys.windowMaximized, true);
 
   @override
   void onWindowMinimize() {}
@@ -55,20 +76,34 @@ class WindowSizeToSettingsListener implements WindowListener {
 
   // Note: linux does not have window resized, so we need to use window resize
   // and debounce it
+  Timer? _debounce;
+  void dispose() => _debounce?.cancel();
   @override
   void onWindowResize() {
     if (isLinux) {
       if (_debounce?.isActive ?? false) _debounce?.cancel();
       _debounce = Timer(const Duration(seconds: 5), () {
-        WindowManager.instance.getSize().then(_onResize);
+        WindowManager.instance.getSize().then((v) async {
+          if (_sp.getBool(SPKeys.saveWindowSize) ?? false) {
+            _sp
+                .setInt(SPKeys.windowHeight, v.height.toInt())
+                .then((_) => _sp.setInt(SPKeys.windowWidth, v.width.toInt()));
+          }
+        });
       });
     }
   }
 
   @override
   void onWindowResized() {
     if (isMacOS || isWindows) {
-      WindowManager.instance.getSize().then(_onResize);
+      WindowManager.instance.getSize().then((v) async {
+        if (_sp.getBool(SPKeys.saveWindowSize) ?? false) {
+          _sp
+              .setInt(SPKeys.windowHeight, v.height.toInt())
+              .then((_) => _sp.setInt(SPKeys.windowWidth, v.width.toInt()));
+        }
+      });
     }
   }
 
@@ -79,5 +114,5 @@ class WindowSizeToSettingsListener implements WindowListener {
   void onWindowUndocked() {}
 
   @override
-  void onWindowUnmaximize() => _onMaximize(false);
+  void onWindowUnmaximize() => _sp.setBool(SPKeys.windowMaximized, false);
 }

lib/register.dart

@@ -1,5 +1,6 @@
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_discord_rpc/flutter_discord_rpc.dart';
 import 'package:github/github.dart';
 import 'package:local_notifier/local_notifier.dart';
@@ -14,6 +15,7 @@ import 'package:window_manager/window_manager.dart';
 import 'app/app_model.dart';
 import 'app/connectivity_model.dart';
 import 'app/view/routing_manager.dart';
+import 'app/window_size_to_settings_listener.dart';
 import 'app_config.dart';
 import 'custom_content/custom_content_model.dart';
 import 'expose/expose_service.dart';
@@ -64,6 +66,19 @@ void registerDependencies() {
     di.registerSingletonAsync<WindowManager>(() async {
       final wm = WindowManager.instance;
       await wm.ensureInitialized();
+      await wm.waitUntilReadyToShow(
+        const WindowOptions(
+          backgroundColor: Colors.transparent,
+          minimumSize: Size(500, 700),
+          skipTaskbar: false,
+          titleBarStyle: TitleBarStyle.hidden,
+        ),
+        () async {
+          await windowManager.show();
+          await windowManager.focus();
+        },
+      );
+
       return wm;
     });
   }
@@ -84,20 +99,27 @@ void registerDependencies() {
           defaultValue: '2.11.0',
         );
         return SettingsService(
-          windowManager: AppConfig.windowManagerImplemented
-              ? di<WindowManager>()
-              : null,
           forcedUpdateThreshold: forcedUpdateThreshold,
           sharedPreferences: di<SharedPreferences>(),
           downloadsDefaultDir: downloadsDefaultDir,
         );
       },
-      dependsOn: [
-        SharedPreferences,
-        if (AppConfig.windowManagerImplemented) WindowManager,
-      ],
+      dependsOn: [SharedPreferences],
       dispose: (s) async => s.dispose(),
-    )
+    );
+
+  if (AppConfig.windowManagerImplemented) {
+    di.registerSingletonAsync<WindowSizeToSettingsListener>(
+      () async => WindowSizeToSettingsListener.register(
+        sharedPreferences: di<SharedPreferences>(),
+        windowManager: di<WindowManager>(),
+      ),
+      dispose: (s) => s.dispose(),
+      dependsOn: [SharedPreferences, WindowManager],
+    );
+  }
+
+  di
     ..registerSingletonWithDependencies(
       () => LastfmService(settingsService: di<SettingsService>()),
       dependsOn: [SettingsService],

lib/settings/settings_service.dart

@@ -1,11 +1,8 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:window_manager/window_manager.dart';
 
-import '../app/window_size_to_settings_listener.dart';
 import '../app_config.dart';
 import '../common/data/close_btn_action.dart';
 import '../common/file_names.dart';
@@ -20,41 +17,9 @@ class SettingsService {
     required String? downloadsDefaultDir,
     required SharedPreferences sharedPreferences,
     required String forcedUpdateThreshold,
-    required WindowManager? windowManager,
   }) : _preferences = sharedPreferences,
        _downloadsDefaultDir = downloadsDefaultDir,
-       _forcedUpdateThreshold = forcedUpdateThreshold {
-    if (windowManager != null) {
-      final wm = windowManager;
-      final ps = _preferences;
-      wm
-        ..setMinimumSize(const Size(500, 700))
-        ..setSize(const Size(950, 820));
-      wm.addListener(
-        WindowSizeToSettingsListener(
-          onFullscreen: (v) => ps.setBool(SPKeys.windowFullscreen, v),
-          onMaximize: (v) => ps.setBool(SPKeys.windowMaximized, v),
-          onResize: (v) async {
-            if (ps.getBool(SPKeys.saveWindowSize) ?? false) {
-              ps
-                  .setInt(SPKeys.windowHeight, v.height.toInt())
-                  .then((_) => ps.setInt(SPKeys.windowWidth, v.width.toInt()));
-            }
-          },
-        ),
-      );
-
-      if (ps.getBool(SPKeys.windowFullscreen) ?? false) {
-        wm.setFullScreen(true);
-      } else if (ps.getBool(SPKeys.windowMaximized) ?? false) {
-        wm.maximize();
-      } else {
-        final height = ps.getInt(SPKeys.windowHeight) ?? 820;
-        final width = ps.getInt(SPKeys.windowWidth) ?? 950;
-        wm.setSize(Size(width.toDouble(), height.toDouble()));
-      }
-    }
-  }
+       _forcedUpdateThreshold = forcedUpdateThreshold;
 
   final String? _downloadsDefaultDir;
   final SharedPreferences _preferences;
@@ -156,8 +121,7 @@ class SettingsService {
       _preferences.setBool(SPKeys.blurredPlayerBackground, value).then(notify);
 
   bool get saveWindowSize =>
-      _preferences.getBool(SPKeys.saveWindowSize) ??
-      AppConfig.windowManagerImplemented;
+      _preferences.getBool(SPKeys.saveWindowSize) ?? false;
   void setSaveWindowSize(bool value) =>
       _preferences.setBool(SPKeys.saveWindowSize, value).then(notify);
 

lib/settings/view/about_section.dart

@@ -68,9 +68,9 @@ class _AboutTileState extends State<_AboutTile> {
     );
 
     return YaruTile(
-      subtitle: Text(
-        context.l10n.downloadsOfLatestRelease(downloads.toString()),
-      ),
+      subtitle: downloads == null
+          ? null
+          : Text(context.l10n.downloadsOfLatestRelease(downloads.toString())),
       title:
           !di<ConnectivityModel>().isOnline == true ||
               !appModel.allowManualUpdate