Add context menu option for toggling rich presence

pizzaboxer · Jul 20, 2023 · 05185e9 · 05185e9
1 parent b677ce5
commit 05185e9
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 30 deletions.
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -259,8 +259,7 @@ private async Task StartRoblox()
  App.Logger.WriteLine("[Bootstrapper::StartRoblox] Using Discord Rich Presence");
  richPresence = new(activityWatcher);
 
- if (App.NotifyIcon is not null)
- App.NotifyIcon.RichPresenceIntegration = richPresence;
+ App.NotifyIcon?.SetRichPresenceHandler(richPresence);
  }
  }
 

diff --git a/Bloxstrap/Integrations/DiscordRichPresence.cs b/Bloxstrap/Integrations/DiscordRichPresence.cs
@@ -8,6 +8,7 @@ public class DiscordRichPresence : IDisposable
  private readonly RobloxActivity _activityWatcher;
 
  private RichPresence? _currentPresence;
+ private bool _visible = true;
  private string? _initialStatus;
  private long _currentUniverseId;
  private DateTime? _timeStartedUniverse;
@@ -89,6 +90,18 @@ public void SetStatus(string status)
  UpdatePresence();
  }
 
+ public void SetVisibility(bool visible)
+ {
+ App.Logger.WriteLine($"[DiscordRichPresence::SetVisibility] Setting presence visibility ({visible})");
+
+ _visible = visible;
+
+ if (_visible)
+ UpdatePresence();
+ else
+ _rpcClient.ClearPresence();
+ }
+
  public async Task<bool> SetCurrentGame()
  {
  if (!_activityWatcher.ActivityInGame)
@@ -195,7 +208,8 @@ public void UpdatePresence()
  return;
  }
 
- _rpcClient.SetPresence(_currentPresence);
+ if (_visible)
+ _rpcClient.SetPresence(_currentPresence);
  }
 
  public void Dispose()

diff --git a/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml b/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml
@@ -20,9 +20,8 @@
  <ContextMenu>
  <MenuItem x:Name="VersionMenuItem" IsEnabled="False" />
  <Separator />
- <MenuItem x:Name="RichPresenceMenuItem" Header="Discord Rich Presence" IsCheckable="True" Visibility="Collapsed" Click="RichPresenceMenuItem_Click" />
+ <MenuItem x:Name="RichPresenceMenuItem" Header="Discord Rich Presence" IsCheckable="True" IsChecked="True" Visibility="Collapsed" />
  <MenuItem x:Name="ServerDetailsMenuItem" Header="See server details" Visibility="Collapsed" />
- <MenuItem x:Name="TestMenuItem" Header="Test" IsCheckable="True" Click="TestMenuItem_Click" />
  </ContextMenu>
  </ui:UiWindow.ContextMenu>
 </ui:UiWindow>
diff --git a/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs b/Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs
@@ -42,15 +42,5 @@ private void Window_Loaded(object? sender, RoutedEventArgs e)
  exStyle |= NativeMethods.WS_EX_TOOLWINDOW;
  NativeMethods.SetWindowLongPtr(wndHelper.Handle, NativeMethods.GWL_EXSTYLE, (IntPtr)exStyle);
  }
-
- private void RichPresenceMenuItem_Click(object sender, RoutedEventArgs e)
- {
- Controls.ShowMessageBox($"hi how u doing i am {RichPresenceMenuItem.IsChecked}", MessageBoxImage.Warning);
- }
-
- private void TestMenuItem_Click(object sender, RoutedEventArgs e)
- {
- Controls.ShowMessageBox($"hi how u doing i am {TestMenuItem.IsChecked}", MessageBoxImage.Warning);
- }
  }
 }
diff --git a/Bloxstrap/UI/NotifyIconWrapper.cs b/Bloxstrap/UI/NotifyIconWrapper.cs
@@ -13,11 +13,12 @@ public class NotifyIconWrapper : IDisposable
 
  private readonly System.Windows.Forms.NotifyIcon _notifyIcon;
  private MenuContainer? _menuContainer;
+
  private RobloxActivity? _activityWatcher;
+ private DiscordRichPresence? _richPresenceHandler;
 
  private ServerInformation? _serverInformationWindow;
 
- public DiscordRichPresence? RichPresenceIntegration;
 
  EventHandler? _alertClickHandler;
 
@@ -35,6 +36,32 @@ public NotifyIconWrapper()
  _notifyIcon.MouseClick += MouseClickEventHandler;
  }
 
+ #region Handler registers
+ public void SetRichPresenceHandler(DiscordRichPresence richPresenceHandler)
+ {
+ if (_richPresenceHandler is not null)
+ return;
+
+ _richPresenceHandler = richPresenceHandler;
+
+ if (_menuContainer is null)
+ return;
+
+ _menuContainer.Dispatcher.Invoke(() => _menuContainer.RichPresenceMenuItem.Visibility = Visibility.Visible);
+ }
+
+ public void SetActivityWatcher(RobloxActivity activityWatcher)
+ {
+ if (_activityWatcher is not null)
+ return;
+
+ _activityWatcher = activityWatcher;
+ _activityWatcher.OnGameJoin += (_, _) => Task.Run(OnGameJoin);
+ _activityWatcher.OnGameLeave += OnGameLeave;
+ }
+ #endregion
+
+ #region Context menu
  public void InitializeContextMenu()
  {
  if (_menuContainer is not null)
@@ -43,18 +70,19 @@ public void InitializeContextMenu()
  _menuContainer = new();
  _menuContainer.Dispatcher.BeginInvoke(_menuContainer.ShowDialog);
  _menuContainer.ServerDetailsMenuItem.Click += (_, _) => ShowServerInformationWindow();
+ _menuContainer.RichPresenceMenuItem.Click += (_, _) => _richPresenceHandler?.SetVisibility(_menuContainer.RichPresenceMenuItem.IsChecked);
  _menuContainer.Closing += (_, _) => App.Logger.WriteLine("[NotifyIconWrapper::NotifyIconWrapper] Context menu container closed");
  }
 
- public void SetActivityWatcher(RobloxActivity activityWatcher)
+ public void MouseClickEventHandler(object? sender, System.Windows.Forms.MouseEventArgs e)
  {
- if (_activityWatcher is not null)
+ if (e.Button != System.Windows.Forms.MouseButtons.Right || _menuContainer is null)
  return;
 
- _activityWatcher = activityWatcher;
- _activityWatcher.OnGameJoin += (_, _) => Task.Run(OnGameJoin);
- _activityWatcher.OnGameLeave += OnGameLeave;
+ _menuContainer.Activate();
+ _menuContainer.ContextMenu.IsOpen = true;
  }
+ #endregion
 
  public async void OnGameJoin()
  {
@@ -78,15 +106,6 @@ public void OnGameLeave(object? sender, EventArgs e)
 
  }
 
- public void MouseClickEventHandler(object? sender, System.Windows.Forms.MouseEventArgs e) 
- {
- if (e.Button != System.Windows.Forms.MouseButtons.Right || _menuContainer is null)
- return;
-
- _menuContainer.Activate();
- _menuContainer.ContextMenu.IsOpen = true;
- }
-
  public void ShowServerInformationWindow()
  {
  if (_serverInformationWindow is null)