Add option to show popup when changing brightness/temperature

NightGlow/App.config

@@ -52,6 +52,9 @@
             <setting name="DdcConfigJson" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ShowBrightTempPopup" serializeAs="String">
+                <value>False</value>
+            </setting>
         </NightGlow.Properties.Settings>
     </userSettings>
 </configuration>

NightGlow/App.xaml

@@ -29,6 +29,13 @@
             <SolidColorBrush x:Key="SecondaryHueMidBrush" Color="{DynamicResource AccentColor}" />
             <SolidColorBrush x:Key="SecondaryHueMidForegroundBrush" Color="{DynamicResource TextColor}" />
 
+            <!-- Match/similar colors to the Windows volume popup for consistency -->
+            <!-- If changing Fore color, need to change color of popup SVGs too -->
+            <SolidColorBrush x:Key="WinVolPopupDarkBackColor" Color="#242424" />
+            <SolidColorBrush x:Key="WinVolPopupDarkForeColor" Color="#d9d6d6" />
+            <SolidColorBrush x:Key="WinVolPopupProgressDarkBackColor" Color="#7d7d7d" />
+            <SolidColorBrush x:Key="WinVolPopupDarkBorderColor" Color="#424242" />
+
             <Style x:Key="SliderLimitPreview" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="14" />
                 <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />

NightGlow/App.xaml.cs

@@ -46,7 +46,9 @@ private void ConfigureServices(IServiceCollection services)
 
         services.AddSingleton<NotifyIconViewModel>();
         services.AddSingleton<MainWindowViewModel>();
+        services.AddSingleton<PopupViewModel>();
 
+        services.AddSingleton<PopupWindow>();
         services.AddTransient<MainWindow>();
     }
 

NightGlow/NightGlow.csproj

@@ -12,6 +12,8 @@
   <ItemGroup>
     <None Remove="Assets\app-icon.ico" />
     <None Remove="Assets\app-icon.png" />
+    <None Remove="Assets\popup-brightness.svg" />
+    <None Remove="Assets\popup-temperature.svg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,11 +23,14 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog" Version="3.0.1" />
+    <PackageReference Include="SharpVectors.Wpf" Version="1.8.4.2" />
   </ItemGroup>
 
   <ItemGroup>
     <Resource Include="Assets\app-icon.ico" />
     <Resource Include="Assets\app-icon.png" />
+    <Resource Include="Assets\popup-brightness.svg" />
+    <Resource Include="Assets\popup-temperature.svg" />
   </ItemGroup>
 
   <ItemGroup>

NightGlow/Properties/Settings.settings

@@ -47,5 +47,8 @@
     <Setting Name="DdcConfigJson" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ShowBrightTempPopup" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

NightGlow/Services/NightGlowService.cs

@@ -9,6 +9,8 @@
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Threading.Tasks;
+using NightGlow.Views;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace NightGlow.Services;
 
@@ -21,6 +23,8 @@ public class NightGlowService : ObservableObject, IDisposable
     private readonly GammaService _gammaService;
     private readonly DdcService _ddcService;
 
+    private readonly IServiceProvider _serviceProvider;
+
     private readonly IDisposable _eventRegistration;
 
     public double Brightness
@@ -41,13 +45,15 @@ public NightGlowService(
         SettingsService settingsService,
         HotKeyService hotKeyService,
         GammaService gammaService,
-        DdcService ddcService
+        DdcService ddcService,
+        IServiceProvider serviceProvider
     )
     {
         _settingsService = settingsService;
         _hotKeyService = hotKeyService;
         _gammaService = gammaService;
         _ddcService = ddcService;
+        _serviceProvider = serviceProvider;
 
         RegisterHotKeys();
 
@@ -184,6 +190,11 @@ private void ChangeConfig(double brightnessOffset, int temperatureOffset)
         OnPropertyChanged(nameof(Temperature));
 
         UpdateConfiguration();
+
+        if (_settingsService.ShowBrightTempPopup)
+        {
+            _serviceProvider.GetRequiredService<PopupWindow>().ShowPopup();
+        }
     }
 
     // Using the brightness value, check wheter to use ddc/gamma to set the brightness

NightGlow/Services/SettingsService.cs

@@ -37,6 +37,17 @@ public bool ExtendedGammaRange
         set => _extendedGammaRange.Set = value;
     }
 
+    public bool ShowBrightTempPopup
+    {
+        get => Settings.Default.ShowBrightTempPopup;
+        set
+        {
+            Settings.Default.ShowBrightTempPopup = value;
+            Settings.Default.Save();
+            OnPropertyChanged(nameof(ShowBrightTempPopup));
+        }
+    }
+
     public bool FirstLaunch
     {
         get => Settings.Default.FirstLaunch;

NightGlow/ViewModels/NotifyIconViewModel.cs

@@ -35,7 +35,10 @@ NightGlowService nightGlowService
 
     public void ShowWindow()
     {
-        Application.Current.MainWindow ??= _serviceProvider.GetRequiredService<MainWindow>();
+        if (!(Application.Current.MainWindow is MainWindow))
+        {
+            Application.Current.MainWindow = _serviceProvider.GetRequiredService<MainWindow>();
+        }
         Application.Current.MainWindow.Show();
         Application.Current.MainWindow.Activate();
     }

NightGlow/ViewModels/PopupViewModel.cs

@@ -0,0 +1,21 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using NightGlow.Services;
+
+namespace NightGlow.ViewModels;
+
+public partial class PopupViewModel : ObservableObject
+{
+
+    private readonly SettingsService _settingsService;
+    private readonly NightGlowService _nightGlowService;
+
+    public SettingsService SettingsService { get => _settingsService; }
+    public NightGlowService NightGlowService { get => _nightGlowService; }
+
+    public PopupViewModel(SettingsService settingsService, NightGlowService nightGlowService)
+    {
+        _settingsService = settingsService;
+        _nightGlowService = nightGlowService;
+    }
+
+}

NightGlow/Views/Controls/PopupDisplayInfoView.xaml

@@ -0,0 +1,61 @@
+<UserControl
+    x:Class="NightGlow.Views.Controls.PopupDisplayInfoView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:local="clr-namespace:NightGlow.Views.Controls"
+    xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
+    mc:Ignorable="d"
+    Padding="10"
+    >
+
+    <Grid>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="16"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="32"/>
+        </Grid.ColumnDefinitions>
+
+        <svgc:SvgViewbox
+            Source="{Binding Icon, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:PopupDisplayInfoView}}}"
+            Width="16"
+            Height="16"
+            Grid.Column="0"
+            VerticalAlignment="Center"
+            />
+
+        <materialDesign:Card
+            materialDesign:ElevationAssist.Elevation="Dp0"
+            UniformCornerRadius="2"
+            Grid.Column="1"
+            VerticalAlignment="Center"
+            Margin="12,2,10,0"
+            >
+
+            <ProgressBar
+                Value="{Binding SliderValue, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:PopupDisplayInfoView}}}"
+                Minimum="{Binding SliderValueMin, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:PopupDisplayInfoView}}}"
+                Maximum="{Binding SliderValueMax, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:PopupDisplayInfoView}}}"
+                materialDesign:TransitionAssist.DisableTransitions="True"
+                Foreground="{DynamicResource WinVolPopupDarkForeColor}"
+                Background="{DynamicResource WinVolPopupProgressDarkBackColor}"
+                BorderThickness="0"
+                />
+
+        </materialDesign:Card>
+
+        <TextBlock
+            Text="{Binding SliderValue, StringFormat={}{0:F0}, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:PopupDisplayInfoView}}}"
+            FontSize="14"
+            Grid.Column="2"
+            VerticalAlignment="Center"
+            TextAlignment="Center"
+            Width="32"
+            />
+
+    </Grid>
+
+</UserControl>

NightGlow/Views/Controls/PopupDisplayInfoView.xaml.cs

@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NightGlow.Views.Controls;
+
+public partial class PopupDisplayInfoView : UserControl
+{
+
+    public static readonly DependencyProperty SliderValueProperty = DependencyProperty.Register(nameof(SliderValue), typeof(double), typeof(PopupDisplayInfoView), null);
+
+    public double SliderValue
+    {
+        get => (double)GetValue(SliderValueProperty);
+        set => SetValue(SliderValueProperty, value);
+    }
+
+    public static readonly DependencyProperty SliderValueMinProperty = DependencyProperty.Register(nameof(SliderValueMin), typeof(double), typeof(PopupDisplayInfoView), null);
+
+    public double SliderValueMin
+    {
+        get => (double)GetValue(SliderValueMinProperty);
+        set => SetValue(SliderValueMinProperty, value);
+    }
+
+    public static readonly DependencyProperty SliderValueMaxProperty = DependencyProperty.Register(nameof(SliderValueMax), typeof(double), typeof(PopupDisplayInfoView), null);
+
+    public double SliderValueMax
+    {
+        get => (double)GetValue(SliderValueMaxProperty);
+        set => SetValue(SliderValueMaxProperty, value);
+    }
+
+    public string Icon { get; set; }
+
+    public PopupDisplayInfoView()
+    {
+        InitializeComponent();
+    }
+
+}

NightGlow/Views/PopupWindow.xaml

@@ -0,0 +1,73 @@
+<Window
+    x:Class="NightGlow.Views.PopupWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:local="clr-namespace:NightGlow.Views"
+    xmlns:uc="clr-namespace:NightGlow.Views.Controls"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:conv="clr-namespace:NightGlow.Views.Converters"
+    mc:Ignorable="d"
+    Width="200"
+    WindowStyle="None"
+    AllowsTransparency="True"
+    Topmost="True"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    Background="Transparent"
+    SizeToContent="Height"
+    Focusable="False"
+    TextElement.Foreground="{DynamicResource WinVolPopupDarkForeColor}"
+    >
+
+    <Window.Resources>
+        <conv:DecToPctConverter x:Key="DecToPctConverter"/>
+    </Window.Resources>
+
+    <!-- View to animate in the window. Larger bottom padding so view isnt immediately cut off when starting to animate -->
+    <Border
+        x:Name="AnimatedContainer"
+        Padding="4,4,4,16"
+        >
+
+        <Border.RenderTransform>
+            <TranslateTransform x:Name="AnimatedContainerTransform" />
+        </Border.RenderTransform>
+
+        <materialDesign:Card
+            Style="{StaticResource MaterialDesignElevatedCard}"
+            Background="{DynamicResource WinVolPopupDarkBackColor}"
+            UniformCornerRadius="10"
+            >
+
+            <Border
+                BorderBrush="{DynamicResource WinVolPopupDarkBorderColor}"
+                BorderThickness="1"
+                CornerRadius="10"
+                Padding="0,2"
+                >
+
+                <StackPanel
+                    Orientation="Vertical"
+                    >
+
+                    <uc:PopupDisplayInfoView
+                        Icon="/Assets/popup-brightness.svg"
+                        SliderValue="{Binding NightGlowService.Brightness, Converter={StaticResource DecToPctConverter}}"
+                        SliderValueMin="{Binding SettingsService.BrightnessMin, Converter={StaticResource DecToPctConverter}}"
+                        SliderValueMax="{Binding SettingsService.BrightnessMax, Converter={StaticResource DecToPctConverter}}"
+                        />
+
+                    <uc:PopupDisplayInfoView
+                        Icon="/Assets/popup-temperature.svg"
+                        SliderValue="{Binding NightGlowService.Temperature}"
+                        SliderValueMin="{Binding SettingsService.TemperatureMin}"
+                        SliderValueMax="{Binding SettingsService.TemperatureMax}"
+                        />
+
+                </StackPanel>
+            </Border>
+        </materialDesign:Card>
+    </Border>
+</Window>