refactor: tray and window behaviours

packages/dart/npt_flutter/lib/app.dart

@@ -79,7 +79,7 @@ class App extends StatelessWidget {
 
           /// A cubit which manages the system tray entries
           BlocProvider<TrayCubit>(
-            create: (_) => TrayCubit()..initialize(),
+            create: (_) => TrayCubit(),
           ),
 
           /// A bloc which manages favorites

packages/dart/npt_flutter/lib/features/favorite/bloc/favorite_bloc.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:npt_flutter/app.dart';
 import 'package:npt_flutter/features/favorite/favorite.dart';
-import 'package:npt_flutter/features/tray_manager/tray_manager.dart';
 
 part 'favorite_event.dart';
 part 'favorite_state.dart';
@@ -32,7 +31,6 @@ class FavoriteBloc extends LoggingBloc<FavoriteEvent, FavoritesState> {
       return;
     }
     emit(FavoritesLoaded(favs.values));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   FutureOr<void> _onAdd(
@@ -44,7 +42,6 @@ class FavoriteBloc extends LoggingBloc<FavoriteEvent, FavoritesState> {
     emit(FavoritesLoaded(
       [...(state as FavoritesLoaded).favorites, event.favorite],
     ));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
     try {
       await _repo.addFavorite(event.favorite);
     } catch (_) {}
@@ -63,7 +60,6 @@ class FavoriteBloc extends LoggingBloc<FavoriteEvent, FavoritesState> {
           .difference(event.toRemove.toSet()),
     ));
 
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
     try {
       var profileIds = <String>{};
       for (Favorite fav in event.toRemove) {

packages/dart/npt_flutter/lib/features/favorite/models/favorite.dart

@@ -29,6 +29,9 @@ sealed class Favorite extends Loggable {
   Future<String?> get displayName;
   String? get status;
   Iterable<String> get profileIds;
+
+  /// These 4 functions are for interacting with favorites in the tray,
+  /// since the implementation may differ by type of favoritable
   bool isFavoriteMatch(Favoritable favoritable);
   bool isLoadedInProfiles(Iterable<String> profiles);
   bool containsProfile(String uuid);

packages/dart/npt_flutter/lib/features/profile/bloc/profile_bloc.dart

@@ -8,7 +8,6 @@ import 'package:npt_flutter/app.dart';
 import 'package:npt_flutter/features/profile/profile.dart';
 import 'package:npt_flutter/features/profile_list/profile_list.dart';
 import 'package:npt_flutter/features/settings/settings.dart';
-import 'package:npt_flutter/features/tray_manager/tray_manager.dart';
 import 'package:socket_connector/socket_connector.dart';
 
 part 'profile_event.dart';
@@ -38,12 +37,10 @@ class ProfileBloc extends LoggingBloc<ProfileEvent, ProfileState> {
 
     if (profile == null) {
       emit(ProfileFailedLoad(uuid));
-      App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
       return;
     }
 
     emit(ProfileLoaded(uuid, profile: profile));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onLoadOrCreate(
@@ -70,12 +67,10 @@ class ProfileBloc extends LoggingBloc<ProfileEvent, ProfileState> {
           localPort: 0,
         ),
       ));
-      App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
       return;
     }
 
     emit(ProfileLoaded(uuid, profile: profile));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onEdit(
@@ -119,7 +114,6 @@ class ProfileBloc extends LoggingBloc<ProfileEvent, ProfileState> {
           .invalidate(uuid);
       emit(ProfileFailedSave(uuid, profile: event.profile));
     }
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onStart(
@@ -214,7 +208,6 @@ class ProfileBloc extends LoggingBloc<ProfileEvent, ProfileState> {
       // Save the socket connector to state so it can be used to stop npt later
       App.navState.currentContext?.read<ProfilesRunningCubit>().cache(uuid, sc);
       emit(ProfileStarted(uuid, profile: profile));
-      App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
     } catch (err) {
       cancelSubs?.call();
       emit(ProfileFailedStart(
@@ -229,7 +222,6 @@ class ProfileBloc extends LoggingBloc<ProfileEvent, ProfileState> {
           ?.read<ProfilesRunningCubit>()
           .invalidate(uuid);
       emit(ProfileLoaded(uuid, profile: profile));
-      App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
     }
   }
 

packages/dart/npt_flutter/lib/features/profile_list/bloc/profile_list_bloc.dart

@@ -4,7 +4,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:npt_flutter/app.dart';
 import 'package:npt_flutter/features/favorite/favorite.dart';
 import 'package:npt_flutter/features/profile/profile.dart';
-import 'package:npt_flutter/features/tray_manager/tray_manager.dart';
 
 part 'profile_list_event.dart';
 part 'profile_list_state.dart';
@@ -31,18 +30,15 @@ class ProfileListBloc extends LoggingBloc<ProfileListEvent, ProfileListState> {
 
     if (profiles == null) {
       emit(const ProfileListFailedLoad());
-      App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
       return;
     }
 
     emit(ProfileListLoaded(profiles: profiles));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onUpdate(
       ProfileListUpdateEvent event, Emitter<ProfileListState> emit) async {
     emit(ProfileListLoaded(profiles: event.profiles));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onDelete(
@@ -69,7 +65,6 @@ class ProfileListBloc extends LoggingBloc<ProfileListEvent, ProfileListState> {
       unawaited(_repo.deleteProfile(uuid));
     }
     bloc?.add(FavoriteRemoveEvent(favoritesToRemove));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   Future<void> _onAdd(

packages/dart/npt_flutter/lib/features/profile_list/cubit/profiles_running_cubit.dart

@@ -1,6 +1,4 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:npt_flutter/app.dart';
-import 'package:npt_flutter/features/tray_manager/tray_manager.dart';
 import 'package:socket_connector/socket_connector.dart';
 
 part 'profiles_running_state.dart';
@@ -10,11 +8,9 @@ class ProfilesRunningCubit extends LoggingCubit<ProfilesRunningState> {
 
   void cache(String uuid, SocketConnector connector) {
     emit(state.withConnector(uuid, connector));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 
   void invalidate(String uuid) {
     emit(state.withoutConnector(uuid));
-    App.navState.currentContext?.read<TrayCubit>().reloadFavorites();
   }
 }

packages/dart/npt_flutter/lib/features/tray_manager/cubit/tray_cubit.dart

@@ -87,34 +87,50 @@ class TrayCubit extends LoggingCubit<TrayState> {
     emit(const TrayLoaded());
   }
 
-  Future<void> reloadFavorites() async {
+  Future<void> reload() async {
     var context = App.navState.currentContext;
     if (context == null) return;
+    var init = initialize();
+
+    /// Access the context before any awaited function calls
     var showSettings = context.read<OnboardingCubit>().state is Onboarded;
     var favoriteBloc = context.read<FavoriteBloc>();
     var profilesList = context.read<ProfileListBloc>();
-    if (state is TrayInitial) {
-      await initialize();
-    }
+
+    await init;
+
+    /// Get favorites
     if (favoriteBloc.state is! FavoritesLoaded) return;
     var favorites = (favoriteBloc.state as FavoritesLoaded).favorites;
+
+    /// Get profiles uuid list
     if (profilesList.state is! ProfileListLoaded) return;
     var profiles = (profilesList.state as ProfileListLoaded).profiles;
+
+    /// Generate the new menu based on current state
     var favMenuItems = await Future.wait(
-      favorites.where((e) => e.isLoadedInProfiles(profiles)).map((e) async {
+      favorites
+          .where((fav) => fav.isLoadedInProfiles(profiles))
+          .map((fav) async {
         /// Make sure to call [e.displayName] and [e.isRunning] only once to
         /// ensure good performance - these getters call a bunch of nested
         /// information from elsewhere in the app state
-        var displayName = await e.displayName;
-        var status = e.status;
+        var displayName = await fav.displayName;
+        var status = fav.status;
         var label = '$displayName $status';
         return MenuItem(
           label: label,
           toolTip: status,
-          onClick: (_) => e.toggle(),
+          onClick: (_) => fav.toggle(),
         );
       }),
     );
+
+    /// PERF: We should conditionally call setContextMenu if there was a state
+    /// change which resulted in an actual change to the favorites list.
+    /// Currently we just force call updates which is really inefficient
+
+    /// Set the new menu
     await trayManager.setContextMenu(Menu(
       items: [
         ...favMenuItems,

packages/dart/npt_flutter/lib/features/tray_manager/widgets/tray_manager.dart

@@ -1,5 +1,8 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:npt_flutter/features/favorite/favorite.dart';
+import 'package:npt_flutter/features/profile/profile.dart';
+import 'package:npt_flutter/features/profile_list/profile_list.dart';
 import 'package:npt_flutter/features/tray_manager/tray_manager.dart';
 import 'package:tray_manager/tray_manager.dart';
 import 'package:window_manager/window_manager.dart';
@@ -18,11 +21,60 @@ class _TrayManagerState extends State<TrayManager>
     with TrayListener, WindowListener {
   @override
   Widget build(BuildContext context) {
-    var cubit = context.read<TrayCubit>();
-    if (cubit.state is TrayInitial) {
-      cubit.initialize();
+    var trayCubit = context.read<TrayCubit>();
+    if (trayCubit.state is TrayInitial) {
+      trayCubit.initialize();
     }
-    return widget.child;
+
+    /// Must strongly type [context] here or Dart will infer the wrong type for
+    /// the [.read()] extension which causes an error
+    void reloadTray(BuildContext context, _) {
+      context.read<TrayCubit>().reload();
+    }
+
+    var profileCacheCubit = context.read<ProfileCacheCubit>();
+
+    /// This selector reduces the number of times we reload profiles-map
+    return BlocSelector<ProfileListBloc, ProfileListState, Iterable<String>>(
+      selector: (state) {
+        if (state is ProfileListLoaded) return state.profiles;
+        return List.empty();
+      },
+      builder: (context, profiles) => MultiBlocListener(
+        listeners: [
+          /// Reload the tray whenever one of the following states changes
+          /// Note: this doesn't always result in a change to the tray, but we
+          /// still have to check
+          BlocListener<FavoriteBloc, FavoritesState>(
+            listener: reloadTray,
+          ),
+          BlocListener<ProfileListBloc, ProfileListState>(
+            listener: reloadTray,
+          ),
+          BlocListener<ProfilesRunningCubit, ProfilesRunningState>(
+            listener: reloadTray,
+          ),
+
+          /// Yeah I really hate this... an indefinite list of listeners
+          /// but it's the only way to decouple the profiles from having to know
+          /// about the tray
+          ///
+          /// The tray should know about profiles, profiles should not know
+          /// about tray. Even if it is slightly more costly in performance, the
+          /// calls where we take the performance hit are:
+          /// 1. In an asynchronous background task (who cares)
+          /// 2. Worth it, compared to the potential maintenance costs
+          ...profiles.map((uuid) => BlocProvider<ProfileBloc>(
+                key: Key("TrayManager-$uuid"),
+                create: (context) => profileCacheCubit.getProfileBloc(uuid),
+                child: BlocListener<ProfileBloc, ProfileState>(
+                  listener: reloadTray,
+                ),
+              )),
+        ],
+        child: widget.child,
+      ),
+    );
   }
 
   @override

packages/dart/npt_flutter/lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -6,5 +8,11 @@ import 'app.dart';
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   windowManager.ensureInitialized();
-  runApp(const App());
+  try {
+    await windowManager.setSkipTaskbar(true); // Don't show the app icon in dock
+  } catch (_) {
+    log("Failed to setSkipTaskbar");
+  } finally {
+    runApp(const App());
+  }
 }