From 39d744b01cac9ea9b3d63f7bdd1b3c739fdfc0ad Mon Sep 17 00:00:00 2001 From: Matthew Rajala Date: Mon, 8 Jul 2024 15:07:06 -0400 Subject: [PATCH 1/3] fix: diagnostics anchor theme and notif texts --- .../HotReload/HotReloadStatusView.Entries.cs | 4 ++-- src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.Entries.cs b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.Entries.cs index 266e51ef9159..597a798c8895 100644 --- a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.Entries.cs +++ b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.Entries.cs @@ -32,8 +32,8 @@ internal record DevServerEntry() : HotReloadLogEntry(EntrySource.DevServer, -1, ({ InvalidFrames.Count: 0 }, { InvalidFrames.Count: > 0 }) => (EntryIcon.Warning, "Unknown messages"), ({ MissingRequiredProcessors.IsEmpty: true }, { MissingRequiredProcessors.IsEmpty: false }) => (EntryIcon.Warning, "Processors missing"), - ({ KeepAlive.State: KeepAliveState.Idle or KeepAliveState.Ok }, { KeepAlive.State: KeepAliveState.Late }) => (EntryIcon.Error, "Connection lost (> 1000ms)"), - ({ KeepAlive.State: KeepAliveState.Idle or KeepAliveState.Ok }, { KeepAlive.State: KeepAliveState.Lost }) => (EntryIcon.Error, "Connection lost (> 1s)"), + ({ KeepAlive.State: KeepAliveState.Idle or KeepAliveState.Ok }, { KeepAlive.State: KeepAliveState.Late }) => (EntryIcon.Error, "Connection lost (>1000ms)"), + ({ KeepAlive.State: KeepAliveState.Idle or KeepAliveState.Ok }, { KeepAlive.State: KeepAliveState.Lost }) => (EntryIcon.Error, "Connection lost (>1s)"), ({ KeepAlive.State: KeepAliveState.Idle or KeepAliveState.Ok }, { KeepAlive.State: KeepAliveState.Aborted }) => (EntryIcon.Error, "Connection lost (keep-alive)"), ({ State: ConnectionState.Connected }, { State: ConnectionState.Disconnected }) => (EntryIcon.Error, "Connection lost"), diff --git a/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml b/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml index 1db97935cdc3..879d0f701af2 100644 --- a/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml +++ b/src/Uno.UI.Toolkit/Diagnostics/DiagnosticsOverlay.xaml @@ -14,10 +14,12 @@ #F9F9F9 #EBEBEB + #000000 #282828 #1C1C1C + #FFFFFF @@ -84,8 +86,7 @@ VerticalAlignment="Center" HorizontalAlignment="Center" Data="{StaticResource AnchorIcon}" - Fill="Black" - Opacity="0.6" /> + Fill="{ThemeResource DiagnosticsAnchorFillBrush}" /> Date: Tue, 9 Jul 2024 10:02:08 -0400 Subject: [PATCH 2/3] chore: update icons to new v6 from figma --- .../HotReload/HotReloadStatusView.xaml | 83 +++++++++---------- 1 file changed, 40 insertions(+), 43 deletions(-) diff --git a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml index b683d1762180..7d9667df9241 100644 --- a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml +++ b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml @@ -26,39 +26,56 @@ #C42B1C #09B509 #FD9E0F + #8A8A8A - - + + - - + + + + + + + + + - - + + + + + - - + + + + + - - + + + + + @@ -128,12 +145,11 @@ BorderBrush="{ThemeResource NotificationBorderBrush}" Height="32" CornerRadius="4"> - + Margin="4,-2,0,0" /> - - + - - + - - - - - - @@ -256,7 +264,7 @@ - From 43d7096edf4ef996f0489c1bb39e73afb59404f6 Mon Sep 17 00:00:00 2001 From: Matthew Rajala Date: Tue, 9 Jul 2024 12:17:43 -0400 Subject: [PATCH 3/3] chore: update badge icons to always be white --- .../HotReload/HotReloadStatusView.xaml | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml index 7d9667df9241..fe100056585a 100644 --- a/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml +++ b/src/Uno.UI.RemoteControl/HotReload/HotReloadStatusView.xaml @@ -29,28 +29,32 @@ #8A8A8A - + + - + - + + - + - + + - + + @@ -61,6 +65,7 @@ + @@ -70,13 +75,14 @@ - + + - +