Secondary window (#244)

bdlukaa · web-flow · commit e836a1b31044 · 2024-06-01T13:00:29.000-03:00
diff --git a/lib/main.dart b/lib/main.dart
@@ -113,12 +113,12 @@ Future<void> main(List<String> args) async {
           await SettingsProvider.ensureInitialized();
           await DesktopViewProvider.ensureInitialized();
 
-          final windowType = MultiWindowType.values[int.tryParse(args[0]) ?? 0];
-          final themeMode = ThemeMode.values[int.tryParse(args[2]) ?? 0];
+          final windowType = MultiWindowType.values[int.tryParse(args[1]) ?? 0];
+          final themeMode = ThemeMode.values[int.tryParse(args[3]) ?? 0];
 
           switch (windowType) {
             case MultiWindowType.device:
-              final device = Device.fromJson(json.decode(args[1]));
+              final device = Device.fromJson(json.decode(args[2]));
               configureWindowTitle(device.fullName);
 
               runApp(AlternativeWindow(
@@ -127,7 +127,7 @@ Future<void> main(List<String> args) async {
               ));
               break;
             case MultiWindowType.layout:
-              final layout = Layout.fromJson(args[1]);
+              final layout = Layout.fromJson(args[2]);
               configureWindowTitle(layout.name);
 
               runApp(AlternativeWindow(
@@ -174,7 +174,7 @@ Future<void> main(List<String> args) async {
     ]);
 
     /// Firebase messaging isn't available on windows nor linux
-    if (!kIsWeb && (isMobilePlatform || Platform.isMacOS)) {
+    if (!kIsWeb && isMobilePlatform) {
       FirebaseConfiguration.ensureInitialized();
     }
 
@@ -193,6 +193,14 @@ class UnityApp extends StatefulWidget {
 
   @override
   State<UnityApp> createState() => _UnityAppState();
+
+  static const localizationDelegates = [
+    AppLocalizations.delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+    LocaleNamesLocalizationsDelegate(),
+  ];
 }
 
 class _UnityAppState extends State<UnityApp>
@@ -310,7 +318,9 @@ class _UnityAppState extends State<UnityApp>
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
-        ChangeNotifierProvider(create: (context) => HomeProvider()),
+        ChangeNotifierProvider<HomeProvider>.value(
+          value: HomeProvider.instance,
+        ),
         ChangeNotifierProvider<SettingsProvider>.value(
           value: SettingsProvider.instance,
         ),
@@ -342,13 +352,7 @@ class _UnityAppState extends State<UnityApp>
           navigatorKey: navigatorKey,
           navigatorObservers: [navigatorObserver],
           locale: settings.kLanguageCode.value,
-          localizationsDelegates: const [
-            AppLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-            LocaleNamesLocalizationsDelegate(),
-          ],
+          localizationsDelegates: UnityApp.localizationDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
           themeMode: settings.kThemeMode.value,
           theme: createTheme(brightness: Brightness.light),
diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
@@ -89,46 +89,45 @@ class _SettingsOption<T> {
   }) {
     Future.microtask(() async {
       _value = getDefault != null ? await getDefault!() : def;
+    });
 
-      if (saveAs != null) {
-        this.saveAs = saveAs;
-      } else if (T == bool) {
-        this.saveAs = (value) => value.toString();
-      } else if (T == Duration) {
-        this.saveAs = (value) => (value as Duration).inMilliseconds.toString();
-      } else if (T == Enum) {
-        this.saveAs = (value) => (value as Enum).index.toString();
-      } else if (T == DateFormat) {
-        this.saveAs = (value) => (value as DateFormat).pattern ?? '';
-      } else if (T == Locale) {
-        this.saveAs = (value) => (value as Locale).toLanguageTag();
-      } else if (T == DateTime) {
-        this.saveAs = (value) => (value as DateTime).toIso8601String();
-      } else {
-        this.saveAs = (value) => value.toString();
-      }
+    if (saveAs != null) {
+      this.saveAs = saveAs;
+    } else if (T == bool) {
+      this.saveAs = (value) => value.toString();
+    } else if (T == Duration) {
+      this.saveAs = (value) => (value as Duration).inMilliseconds.toString();
+    } else if (T == Enum) {
+      this.saveAs = (value) => (value as Enum).index.toString();
+    } else if (T == DateFormat) {
+      this.saveAs = (value) => (value as DateFormat).pattern ?? '';
+    } else if (T == Locale) {
+      this.saveAs = (value) => (value as Locale).toLanguageTag();
+    } else if (T == DateTime) {
+      this.saveAs = (value) => (value as DateTime).toIso8601String();
+    } else {
+      this.saveAs = (value) => value.toString();
+    }
 
-      if (loadFrom != null) {
-        this.loadFrom = loadFrom;
-      } else if (T == bool) {
-        this.loadFrom = (value) => (bool.tryParse(value) ?? def) as T;
-      } else if (T == Duration) {
-        this.loadFrom =
-            (value) => Duration(milliseconds: int.parse(value)) as T;
-      } else if (T == Enum) {
-        throw UnsupportedError('Enum type must provide a loadFrom function');
-      } else if (T == DateFormat) {
-        this.loadFrom = (value) => DateFormat(value) as T;
-      } else if (T == Locale) {
-        this.loadFrom = (value) => Locale.fromSubtags(languageCode: value) as T;
-      } else if (T == DateTime) {
-        this.loadFrom = (value) => DateTime.parse(value) as T;
-      } else if (T == double) {
-        this.loadFrom = (value) => double.parse(value) as T;
-      } else {
-        this.loadFrom = (value) => value as T;
-      }
-    });
+    if (loadFrom != null) {
+      this.loadFrom = loadFrom;
+    } else if (T == bool) {
+      this.loadFrom = (value) => (bool.tryParse(value) ?? def) as T;
+    } else if (T == Duration) {
+      this.loadFrom = (value) => Duration(milliseconds: int.parse(value)) as T;
+    } else if (T == Enum) {
+      throw UnsupportedError('Enum type must provide a loadFrom function');
+    } else if (T == DateFormat) {
+      this.loadFrom = (value) => DateFormat(value) as T;
+    } else if (T == Locale) {
+      this.loadFrom = (value) => Locale.fromSubtags(languageCode: value) as T;
+    } else if (T == DateTime) {
+      this.loadFrom = (value) => DateTime.parse(value) as T;
+    } else if (T == double) {
+      this.loadFrom = (value) => double.parse(value) as T;
+    } else {
+      this.loadFrom = (value) => value as T;
+    }
   }
 
   String get defAsString => saveAs(def);
diff --git a/lib/screens/downloads/downloads_manager.dart b/lib/screens/downloads/downloads_manager.dart
@@ -142,8 +142,7 @@ class _DownloadTileState extends State<DownloadTile> {
     super.initState();
     if (widget.initiallyExpanded) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (!mounted) return;
-
+        if (!context.mounted) return;
         Scrollable.ensureVisible(context);
       });
     }
diff --git a/lib/screens/events_browser/events_screen_mobile.dart b/lib/screens/events_browser/events_screen_mobile.dart
@@ -45,9 +45,10 @@ class _EventsScreenMobileState extends State<EventsScreenMobile> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) => showFilterSheet(context, loadInitially: true),
-    );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!context.mounted) return;
+      showFilterSheet(context, loadInitially: true);
+    });
   }
 
   @override
diff --git a/lib/screens/events_browser/filter.dart b/lib/screens/events_browser/filter.dart
@@ -55,6 +55,7 @@ class _EventsDevicesPickerState extends State<EventsDevicesPicker> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!context.mounted) return;
       final eventsProvider = context.read<EventsProvider>();
       final serversProvider = context.read<ServersProvider>();
 
diff --git a/lib/screens/events_timeline/events_playback.dart b/lib/screens/events_timeline/events_playback.dart
@@ -72,6 +72,7 @@ class _EventsPlaybackState extends EventsScreenState<EventsPlayback> {
 
   @override
   Future<void> fetch() async {
+    if (!context.mounted) return;
     final eventsProvider = context.read<EventsProvider>();
     final settings = context.read<SettingsProvider>();
     setState(() {
@@ -199,9 +200,7 @@ class _EventsPlaybackState extends EventsScreenState<EventsPlayback> {
             // special case: the width is less than the mobile breakpoint
             constraints.maxWidth < 630.0 /* kMobileBreakpoint.width */) {
           if (!hasEverFetched) {
-            WidgetsBinding.instance.addPostFrameCallback((_) {
-              fetch();
-            });
+            WidgetsBinding.instance.addPostFrameCallback((_) => fetch());
           }
           if (timeline == null) {
             return SafeArea(
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
@@ -115,6 +115,7 @@ class _MobileHomeState extends State<Home> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      if (!context.mounted) return;
       context.read<HomeProvider>().refreshDeviceOrientation(context);
     });
   }
diff --git a/lib/screens/layouts/desktop/multicast_view.dart b/lib/screens/layouts/desktop/multicast_view.dart
@@ -138,44 +138,50 @@ class _MulticastViewportState extends State<MulticastViewport> {
     }
 
     return LayoutBuilder(builder: (context, constraints) {
-      return Stack(children: [
+      return Stack(alignment: Alignment.center, children: [
         if (size > 1)
           Positioned.fill(
-            child: GridView.count(
-              crossAxisCount: size,
-              childAspectRatio: kHorizontalAspectRatio,
-              physics: const NeverScrollableScrollPhysics(),
-              children: List.generate(size * size, (index) {
-                final row = index ~/ size;
-                final col = index % size;
-
-                return HoverButton(
-                  onDoubleTap: () {
-                    views.updateDevice(
-                      widget.device,
-                      widget.device.copyWith(matrixType: matrixType.next),
+            child: Center(
+              child: AspectRatio(
+                aspectRatio: kHorizontalAspectRatio,
+                child: GridView.count(
+                  crossAxisCount: size,
+                  childAspectRatio: kHorizontalAspectRatio,
+                  physics: const NeverScrollableScrollPhysics(),
+                  shrinkWrap: true,
+                  children: List.generate(size * size, (index) {
+                    final row = index ~/ size;
+                    final col = index % size;
+
+                    return HoverButton(
+                      onDoubleTap: () {
+                        views.updateDevice(
+                          widget.device,
+                          widget.device.copyWith(matrixType: matrixType.next),
+                        );
+                      },
+                      onPressed: () {
+                        view.player.crop(row, col);
+                        currentZoom = (row, col);
+                      },
+                      builder: (context, states) => SizedBox.expand(
+                        child: IgnorePointer(
+                          child: states.isHovering
+                              ? Container(
+                                  decoration: BoxDecoration(
+                                    border: Border.all(
+                                      color: theme.colorScheme.secondary,
+                                      width: 2.25,
+                                    ),
+                                  ),
+                                )
+                              : null,
+                        ),
+                      ),
                     );
-                  },
-                  onPressed: () {
-                    view.player.crop(row, col);
-                    currentZoom = (row, col);
-                  },
-                  builder: (context, states) => SizedBox.expand(
-                    child: IgnorePointer(
-                      child: states.isHovering
-                          ? Container(
-                              decoration: BoxDecoration(
-                                border: Border.all(
-                                  color: theme.colorScheme.secondary,
-                                  width: 2.25,
-                                ),
-                              ),
-                            )
-                          : null,
-                    ),
-                  ),
-                );
-              }),
+                  }),
+                ),
+              ),
             ),
           ),
         for (final overlay in widget.device.overlays)
diff --git a/lib/screens/layouts/desktop/sidebar.dart b/lib/screens/layouts/desktop/sidebar.dart
@@ -51,7 +51,9 @@ class _DesktopSidebarState extends State<DesktopSidebar> {
       final devices = server.devices.sorted(
         searchQuery: searchQuery,
       );
-      _servers[server] = devices;
+      if (devices.isNotEmpty) {
+        _servers[server] = devices;
+      }
     }
   }
 
@@ -90,11 +92,10 @@ class _DesktopSidebarState extends State<DesktopSidebar> {
                 child: Material(
                   type: MaterialType.transparency,
                   child: CustomScrollView(slivers: [
-                    for (final MapEntry<Server, Iterable<Device>>(
-                          key: server,
-                          value: devices,
-                        ) in _servers.entries)
+                    for (final entry in _servers.entries)
                       () {
+                        final server = entry.key;
+                        final devices = entry.value;
                         final isLoading = servers.isServerLoading(server);
                         if (!isLoading &&
                             devices.isEmpty &&
@@ -466,6 +467,7 @@ class _DeviceSelectorTileState extends State<DeviceSelectorTile> {
             child: Text(loc.showFullscreenCamera),
             onTap: () async {
               WidgetsBinding.instance.addPostFrameCallback((_) async {
+                if (!context.mounted) return;
                 var player = UnityPlayers.players[widget.device.uuid];
                 final isLocalController = player == null;
                 if (isLocalController) {
@@ -497,6 +499,7 @@ class _DeviceSelectorTileState extends State<DeviceSelectorTile> {
           child: Text(loc.deviceInfo),
           onTap: () async {
             WidgetsBinding.instance.addPostFrameCallback((_) async {
+              if (!context.mounted) return;
               await showDeviceInfoDialog(context, widget.device);
             });
           },
diff --git a/lib/screens/layouts/video_status_label.dart b/lib/screens/layouts/video_status_label.dart
@@ -98,7 +98,7 @@ class _VideoStatusLabelState extends State<VideoStatusLabel> {
   OverlayEntry? entry;
   bool get isOverlayOpen => entry != null;
   void showOverlay({bool force = false}) {
-    if (entry != null && !force) return;
+    if ((entry != null && !force) || !context.mounted) return;
 
     final box = context.findRenderObject() as RenderBox;
     final boxSize = box.size;
diff --git a/lib/screens/multi_window/single_camera_window.dart b/lib/screens/multi_window/single_camera_window.dart
diff --git a/lib/screens/multi_window/window.dart b/lib/screens/multi_window/window.dart
diff --git a/lib/utils/window.dart b/lib/utils/window.dart
diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ class _MobileHomeState extends State<Home> {`
`115`	`115`	`void initState() {`
`116`	`116`	`super.initState();`
`117`	`117`	`WidgetsBinding.instance.addPostFrameCallback((timeStamp) {`
	`118`	`+ if (!context.mounted) return;`
`118`	`119`	`context.read<HomeProvider>().refreshDeviceOrientation(context);`
`119`	`120`	`});`
`120`	`121`	`}`