quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Notification overhaul and update to avaloniaui 0.10.7

Browse Source
This commit is contained in:
Xjph 2021-10-12 20:45:00 -02:30
parent 840ccad5bf
commit 5159500644
10 changed files with 279 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ObservatoryCore/NativeNotification/NativePopup.cs Normal file
View File

@ -0,0 +1,52 @@
using Observatory.Framework;
using System;
using System.Collections.Generic;
using Observatory.UI.Views;
using Observatory.UI.ViewModels;
namespace Observatory.NativeNotification
{
public class NativePopup
{
private Dictionary<Guid, NotificationView> notifications;
public NativePopup()
{
notifications = new();
}
public Guid InvokeNativeNotification(NotificationArgs notificationArgs)
{
var notificationGuid = Guid.NewGuid();
Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() =>
{
var notifyWindow = new NotificationView(notificationGuid) { DataContext = new NotificationViewModel(notificationArgs) };
notifyWindow.Closed += NotifyWindow_Closed;
notifications.Add(notificationGuid, notifyWindow);
notifyWindow.Show();
});
return notificationGuid;
}
private void NotifyWindow_Closed(object sender, EventArgs e)
{
var notification = (NotificationView)sender;
if (notifications.ContainsKey(notification.Guid))
notifications.Remove(notification.Guid);
}
public void CloseNotification(Guid guid)
{
if (notifications.ContainsKey(guid))
notifications[guid].Close();
}
public void UpdateNotification(Guid guid, NotificationArgs notificationArgs)
{
if (notifications.ContainsKey(guid))
notifications[guid].DataContext = new NotificationViewModel(notificationArgs);
}
}
}

74
ObservatoryCore/NativeNotification/NativeVoice.cs Normal file
View File

@ -0,0 +1,74 @@
using Observatory.Framework;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Speech.Synthesis;
using System.Runtime.InteropServices;
namespace Observatory.NativeNotification
{
public class NativeVoice
{
private Queue<NotificationArgs> notificationEvents;
private bool processing;
public NativeVoice()
{
notificationEvents = new();
processing = false;
}
public void EnqueueAndAnnounce(NotificationArgs eventArgs)
{
notificationEvents.Enqueue(eventArgs);
if (!processing)
{
processing = true;
ProcessQueueAsync();
}
}
private async void ProcessQueueAsync()
{
await Task.Factory.StartNew(ProcessQueue);
}
private void ProcessQueue()
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
var speech = new SpeechSynthesizer()
{
Volume = Properties.Core.Default.VoiceVolume,
Rate = Properties.Core.Default.VoiceRate
};
speech.SelectVoice(Properties.Core.Default.VoiceSelected);
while (notificationEvents.Any())
{
var notification = notificationEvents.Dequeue();
if (notification.TitleSsml?.Length > 0)
{
speech.SpeakSsml(notification.TitleSsml);
}
else
{
speech.Speak(notification.Title);
}
if (notification.DetailSsml?.Length > 0)
{
speech.SpeakSsml(notification.DetailSsml);
}
else
{
speech.Speak(notification.Detail);
}
}
}
processing = false;
}
}
}

12
ObservatoryCore/ObservatoryCore.csproj
View File

@ -22,12 +22,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.6" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.6" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.6" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.6" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.6" />
<PackageReference Include="Egorozh.ColorPicker.Avalonia.Dialog" Version="0.10.1" />
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.7" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
<PackageReference Include="Egorozh.ColorPicker.Avalonia.Dialog" Version="0.10.7" />
<PackageReference Include="MessageBox.Avalonia" Version="1.5.1" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="System.Speech" Version="5.0.0" />

2
ObservatoryCore/PluginManagement/PlaceholderPlugin.cs
View File

@ -32,7 +32,7 @@ namespace Observatory.PluginManagement
public void Load(IObservatoryCore observatoryCore)
{ }
public void OnNotificationEvent(string title, string text)
public void OnNotificationEvent(NotificationArgs notificationArgs)
{ }
}
}

50
ObservatoryCore/PluginManagement/PluginCore.cs
View File

@ -1,6 +1,7 @@
using Observatory.Framework;
using Observatory.Framework.Files;
using Observatory.Framework.Interfaces;
using Observatory.NativeNotification;
using System;
using System.Runtime.InteropServices;
@ -9,6 +10,15 @@ namespace Observatory.PluginManagement
public class PluginCore : IObservatoryCore
{
private readonly NativeVoice NativeVoice;
private readonly NativePopup NativePopup;
public PluginCore()
{
NativeVoice = new();
NativePopup = new();
}
public string Version => System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString();
public Status GetStatus()
@ -16,38 +26,42 @@ namespace Observatory.PluginManagement
throw new NotImplementedException();
}
public void SendNotification(string title, string text)
public Guid SendNotification(string title, string text)
{
return SendNotification(new NotificationArgs() { Title = title, Detail = text });
}
public Guid SendNotification(NotificationArgs notificationArgs)
{
var guid = Guid.Empty;
if (!LogMonitor.GetInstance.ReadAllInProgress())
{
var handler = Notification;
handler?.Invoke(this, new NotificationEventArgs() { Title = title, Detail = text });
handler?.Invoke(this, notificationArgs);
if (Properties.Core.Default.NativeNotify)
{
InvokeNativeNotification(title, text);
guid = NativePopup.InvokeNativeNotification(notificationArgs);
}
if (Properties.Core.Default.VoiceNotify && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
if (Properties.Core.Default.VoiceNotify)
{
var speech = new System.Speech.Synthesis.SpeechSynthesizer()
{
Volume = Properties.Core.Default.VoiceVolume,
Rate = Properties.Core.Default.VoiceRate
};
speech.SelectVoice(Properties.Core.Default.VoiceSelected);
speech.SpeakAsync(title + ": " + text);
NativeVoice.EnqueueAndAnnounce(notificationArgs);
}
}
return guid;
}
private void InvokeNativeNotification(string title, string text)
public void CancelNotification(Guid id)
{
Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() =>
{
var notifyWindow = new UI.Views.NotificationView() { DataContext = new UI.ViewModels.NotificationViewModel(title, text) };
notifyWindow.Show();
});
}
public void UpdateNotification(Guid id, NotificationArgs notificationArgs)
{
}
/// <summary>
@ -97,6 +111,6 @@ namespace Observatory.PluginManagement
Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(action);
}
public event EventHandler<NotificationEventArgs> Notification;
public event EventHandler<NotificationArgs> Notification;
}
}

4
ObservatoryCore/PluginManagement/PluginEventHandler.cs
View File

@ -37,11 +37,11 @@ namespace Observatory.PluginManagement
}
}
public void OnNotificationEvent(object source, NotificationEventArgs notificationEventArgs)
public void OnNotificationEvent(object source, NotificationArgs notificationArgs)
{
foreach (var notifier in observatoryNotifiers)
{
notifier.OnNotificationEvent(notificationEventArgs.Title, notificationEventArgs.Detail);
notifier.OnNotificationEvent(notificationArgs);
}
}
}

3
ObservatoryCore/UI/Models/NotificationModel.cs
View File

@ -11,5 +11,8 @@ namespace Observatory.UI.Models
public string Title { get; set; }
public string Detail { get; set; }
public string Colour { get; set; }
public int Timeout { get; set; }
public double XPos { get; set; }
public double YPos { get; set; }
}
}

10
ObservatoryCore/UI/ViewModels/NotificationViewModel.cs
View File

@ -3,18 +3,22 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Observatory.Framework;
namespace Observatory.UI.ViewModels
{
public class NotificationViewModel : ViewModelBase
{
public NotificationViewModel(string title, string detail)
public NotificationViewModel(NotificationArgs notificationArgs)
{
Notification = new()
{
Title = title,
Detail = detail,
Title = notificationArgs.Title,
Detail = notificationArgs.Detail,
Timeout = notificationArgs.Timeout,
XPos = notificationArgs.XPos,
YPos = notificationArgs.YPos,
Colour = Avalonia.Media.Color.FromUInt32(Properties.Core.Default.NativeNotifyColour).ToString()
};

31
ObservatoryCore/UI/Views/BasicUIView.axaml.cs
View File

@ -63,7 +63,6 @@ namespace Observatory.UI.Views
e.Column.CanUserResize = true;
e.Column.CanUserSort = true;
}
private void UITypeChange()
{
var uiPanel = this.Find<Panel>("UIPanel");
@ -109,6 +108,7 @@ namespace Observatory.UI.Views
{
var dataContext = ((ViewModels.BasicUIViewModel)dataGrid.DataContext).BasicUIGrid;
dataContext.CollectionChanged += ScrollToLast;
}
}
@ -200,9 +200,7 @@ namespace Observatory.UI.Views
{
Header = "Popup Notifications",
DataContext = Properties.Core.Default,
Margin = new Thickness(0, 0),
Background = this.Background,
BorderThickness = new Thickness(0)
Margin = new Thickness(0, 0)
};
Grid notificationGrid = new() { Margin = new Thickness(10, 10) };
@ -244,8 +242,13 @@ namespace Observatory.UI.Views
{
Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() =>
{
var notifyWindow = new UI.Views.NotificationView() { DataContext = new UI.ViewModels.NotificationViewModel("Test Notification", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras suscipit hendrerit libero ac scelerisque.") };
notifyWindow.Show();
var notificationArgs = new NotificationArgs()
{
Title = "Test Notification",
Detail = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras suscipit hendrerit libero ac scelerisque."
};
new NativeNotification.NativePopup().InvokeNativeNotification(notificationArgs);
});
};
@ -448,9 +451,7 @@ namespace Observatory.UI.Views
{
Header = "Voice Notifications",
DataContext = Properties.Core.Default,
Margin = new Thickness(0, 0),
Background = this.Background,
BorderThickness = new Thickness(0)
Margin = new Thickness(0, 0)
};
Grid voiceGrid = new() { Margin = new Thickness(10, 10) };
@ -489,13 +490,6 @@ namespace Observatory.UI.Views
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Properties.Core.Default.VoiceSelected.Length > 0)
{
var speech = new System.Speech.Synthesis.SpeechSynthesizer()
{
Volume = Properties.Core.Default.VoiceVolume,
Rate = Properties.Core.Default.VoiceRate
};
speech.SelectVoice(Properties.Core.Default.VoiceSelected);
List<string> harvardSentences = new()
{
"Oak is strong and also gives shade.",
@ -510,7 +504,10 @@ namespace Observatory.UI.Views
"Move the vat over the hot fire."
};
speech.SpeakAsync("Speech Synthesis Test: " + harvardSentences.OrderBy(s => new Random().NextDouble()).First());
NotificationArgs args = new() { Title = "Speech Synthesis Test", Detail = harvardSentences.OrderBy(s => new Random().NextDouble()).First() };
new NativeNotification.NativeVoice().EnqueueAndAnnounce(args);
}
};

116
ObservatoryCore/UI/Views/NotificationView.axaml.cs
View File

@ -2,25 +2,77 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Markup.Xaml;
using Observatory.UI.ViewModels;
using System;
using System.Timers;
using System.Runtime.InteropServices;
namespace Observatory.UI.Views
{
public partial class NotificationView : Window
{
public NotificationView()
private readonly double scale;
private readonly Timer timer;
private readonly Guid guid;
public NotificationView() : this(default)
{ }
public NotificationView(Guid guid)
{
this.guid = guid;
InitializeComponent();
SystemDecorations = SystemDecorations.None;
ShowInTaskbar = false;
MakeClickThrough(); //Platform specific, currently windows only.
int screen = Properties.Core.Default.NativeNotifyScreen;
int corner = Properties.Core.Default.NativeNotifyCorner;
string font = Properties.Core.Default.NativeNotifyFont;
double scale = Properties.Core.Default.NativeNotifyScale / 100.0;
this.DataContextChanged += NotificationView_DataContextChanged;
scale = Properties.Core.Default.NativeNotifyScale / 100.0;
AdjustText();
AdjustPanel();
AdjustPosition();
timer = new();
timer.Elapsed += CloseNotification;
timer.Interval = Properties.Core.Default.NativeNotifyTimeout;
timer.Start();
#if DEBUG
this.AttachDevTools();
#endif
}
public Guid Guid { get => guid; }
private void NotificationView_DataContextChanged(object sender, EventArgs e)
{
var notification = ((NotificationViewModel)DataContext).Notification;
AdjustText();
AdjustPanel();
AdjustPosition(notification.XPos / 100, notification.YPos / 100);
if (notification.Timeout > 0)
{
timer.Stop();
timer.Interval = notification.Timeout;
timer.Start();
}
else if (notification.Timeout == 0)
{
timer.Stop();
}
}
private void AdjustText()
{
string font = Properties.Core.Default.NativeNotifyFont;
var titleText = this.Find<TextBlock>("Title");
var detailText = this.Find<TextBlock>("Detail");
@ -34,7 +86,10 @@ namespace Observatory.UI.Views
titleText.FontSize *= scale;
detailText.FontSize *= scale;
}
private void AdjustPanel()
{
var textPanel = this.Find<StackPanel>("TextPanel");
Width *= scale;
Height *= scale;
@ -43,8 +98,13 @@ namespace Observatory.UI.Views
var textBorder = this.Find<Border>("TextBorder");
textBorder.BorderThickness *= scale;
}
private void AdjustPosition(double xOverride = -1.0, double yOverride = -1.0)
{
PixelRect screenBounds;
int screen = Properties.Core.Default.NativeNotifyScreen;
int corner = Properties.Core.Default.NativeNotifyCorner;
if (screen == -1 || screen > Screens.All.Count)
screenBounds = Screens.Primary.Bounds;
@ -55,29 +115,29 @@ namespace Observatory.UI.Views
double scaleWidth = Width * displayScale;
double scaleHeight = Height * displayScale;
switch (corner)
if (xOverride >= 0 && yOverride >= 0)
{
default: case 0:
Position = screenBounds.BottomRight - new PixelPoint((int)scaleWidth + 50, (int)scaleHeight + 50);
break;
case 1:
Position = screenBounds.BottomLeft - new PixelPoint(-50, (int)scaleHeight + 50);
break;
case 2:
Position = screenBounds.TopRight - new PixelPoint((int)scaleWidth + 50, -50);
break;
case 3:
Position = screenBounds.TopLeft + new PixelPoint(50, 50);
break;
Position = screenBounds.TopLeft + new PixelPoint(Convert.ToInt32(screenBounds.Width * xOverride), Convert.ToInt32(screenBounds.Height * yOverride));
}
else
{
switch (corner)
{
default:
case 0:
Position = screenBounds.BottomRight - new PixelPoint(Convert.ToInt32(scaleWidth) + 50, Convert.ToInt32(scaleHeight) + 50);
break;
case 1:
Position = screenBounds.BottomLeft - new PixelPoint(-50, Convert.ToInt32(scaleHeight) + 50);
break;
case 2:
Position = screenBounds.TopRight - new PixelPoint(Convert.ToInt32(scaleWidth) + 50, -50);
break;
case 3:
Position = screenBounds.TopLeft + new PixelPoint(50, 50);
break;
}
}
var timer = new System.Timers.Timer();
timer.Elapsed += CloseNotification;
timer.Interval = Properties.Core.Default.NativeNotifyTimeout;
timer.Start();
#if DEBUG
this.AttachDevTools();
#endif
}
private void CloseNotification(object sender, System.Timers.ElapsedEventArgs e)