Fix buttons while browser is fullscreen.

Stop asking for updates if user already answered no.

Daybreak/Configuration/ProjectConfiguration.cs

@@ -5,6 +5,7 @@ using Daybreak.Services.Configuration;
 using Daybreak.Services.Credentials;
 using Daybreak.Services.Logging;
 using Daybreak.Services.Mutex;
+using Daybreak.Services.Runtime;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
@@ -14,7 +15,6 @@ using System.Extensions;
 
 namespace Daybreak.Configuration
 {
-    // TODO: Credit http://bloogum.net/guildwars/
     public static class ProjectConfiguration
     {
         public static void RegisterServices(IServiceProducer serviceProducer)
@@ -32,6 +32,7 @@ namespace Daybreak.Configuration
             serviceProducer.RegisterSingleton<IBloogumClient, BloogumClient>();
             serviceProducer.RegisterSingleton<IApplicationUpdater, ApplicationUpdater>();
             serviceProducer.RegisterSingleton<IMutexHandler, MutexHandler>();
+            serviceProducer.RegisterSingleton<IRuntimeStore, RuntimeStore>();
         }
         public static void RegisterLifetimeServices(IApplicationLifetimeProducer applicationLifetimeProducer)
         {

Daybreak/Controls/ChromiumBrowserWrapper.xaml

@@ -55,6 +55,10 @@
                      PreviewKeyDown="TextBox_PreviewKeyDown"
                      IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"></TextBox>
             <StackPanel Grid.Column="2" Orientation="Horizontal">
+                <local:HomeButton Width="30" Height="30" Margin="5"
+                                  Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                                  IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"
+                                  Clicked="HomeButton_Clicked"></local:HomeButton>
                 <local:StarGlyph Height="30" Width="30" Margin="5"
                              Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
                              IsEnabled="{Binding ElementName=_this, Path=BrowserSupported, Mode=OneWay}"

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -192,6 +192,11 @@ namespace Daybreak.Controls
             this.FavoriteUriChanged?.Invoke(this, this.FavoriteAddress);
         }
 
+        private void HomeButton_Clicked(object sender, EventArgs e)
+        {
+            this.WebBrowser.CoreWebView2.Navigate(this.FavoriteAddress);
+        }
+
         private void MaximizeButton_Clicked(object sender, EventArgs e)
         {
             this.MaximizeClicked?.Invoke(this, e);

Daybreak/Controls/HomeButton.xaml

@@ -0,0 +1,25 @@
+<UserControl x:Class="Daybreak.Controls.HomeButton"
+             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:local="clr-namespace:Daybreak.Controls"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox>
+        <Grid>
+            <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Visibility="Visible" Opacity="0.1" />
+            <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" StrokeThickness="3" Width="60" Height="60"></Ellipse>
+            <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+                <Path Data="m42,45.384l-14,0l0,-13l-8,0l0,13l-14,0l0,-21c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,19l10,0l0,-13l12,0l0,13l10,0l0,-18c0,-0.552 0.447,-1 1,-1s1,0.448 1,1l0,20z"
+                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
+                <Path Data="m47,24.384c-0.249,0 -0.497,-0.092 -0.691,-0.277l-22.309,-21.339l-22.309,21.339c-0.399,0.381 -1.032,0.368 -1.414,-0.031c-0.382,-0.399 -0.367,-1.032 0.031,-1.414l23.692,-22.662l23.691,22.661c0.398,0.382 0.413,1.015 0.031,1.414c-0.196,0.205 -0.458,0.309 -0.722,0.309z"
+                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
+                <Path Data="m39,12.384c-0.553,0 -1,-0.448 -1,-1l0,-6l-6,0c-0.553,0 -1,-0.448 -1,-1s0.447,-1 1,-1l8,0l0,8c0,0.552 -0.447,1 -1,1z"
+                  Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></Path>
+            </Grid>
+            <Ellipse Fill="Transparent" MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"></Ellipse>
+        </Grid>
+    </Viewbox>
+</UserControl>

Daybreak/Controls/HomeButton.xaml.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Daybreak.Controls
+{
+    /// <summary>
+    /// Interaction logic for HomeButton.xaml
+    /// </summary>
+    public partial class HomeButton : UserControl
+    {
+        public event EventHandler Clicked;
+
+        public HomeButton()
+        {
+            this.InitializeComponent();
+        }
+
+        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+        {
+            this.BackgroundEllipse.Opacity = 0.6;
+        }
+
+        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
+        {
+            this.BackgroundEllipse.Opacity = 0;
+        }
+
+        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                Clicked?.Invoke(this, e);
+            }
+        }
+    }
+}

Daybreak/Daybreak.csproj

@@ -9,7 +9,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
-    <Version>0.6.4</Version>
+    <Version>0.6.7</Version>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
@@ -20,7 +20,7 @@
     <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
     <PackageReference Include="SystemExtensions.NetStandard" Version="1.1.3" />
     <PackageReference Include="WCL" Version="1.0.2" />
-    <PackageReference Include="WpfExtended" Version="0.1.1" />
+    <PackageReference Include="WpfExtended" Version="0.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Daybreak/Launch/MainWindow.xaml

@@ -69,8 +69,6 @@
                 </controls:ImageViewer.Effect>
             </controls:ImageViewer>
         </Border>
-        <Grid x:Name="Container" Grid.Row="1">
-        </Grid>
         <wcl:TitleBar x:Name="Titlebar"
                       Background="Transparent" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown"
                       WindowState="Normal" MinimizeButtonClicked="TitleBar_MinimizeButtonClicked"
@@ -80,10 +78,15 @@
                       Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></wcl:TitleBar>
         <ToggleButton Style="{StaticResource Window_SettingsButton}" Width="50" Height="30" HorizontalAlignment="Right"
                       Margin="0, 0, 150, 0" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" Click="SettingsButton_Clicked"></ToggleButton>
-        <TextBox Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
-                 Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}" IsReadOnly="True" VerticalAlignment="Bottom"
+        <controls:OpaqueButton Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
+                 Text="{Binding ElementName=_this, Path=CreditText, Mode=OneWay}" VerticalAlignment="Bottom"
                  HorizontalAlignment="Right" Margin="0, 0, 20, 30" FontSize="22" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                 PreviewMouseLeftButtonDown="CreditTextBox_MouseLeftButtonDown" Cursor="Hand"></TextBox>
+                 Clicked="CreditTextBox_MouseLeftButtonDown" Cursor="Hand"></controls:OpaqueButton>
+        <TextBox Grid.Row="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Opacity="0.6"
+                 Text="{Binding ElementName=_this, Path=CurrentVersionText, Mode=OneWay}" IsReadOnly="True" VerticalAlignment="Bottom"
+                 HorizontalAlignment="Right" Margin="0, 0, 20, 10" FontSize="10" Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></TextBox>
+        <Grid x:Name="Container" Grid.Row="1">
+        </Grid>
         <wcl:Border OnResize="Border_OnResize" Grid.RowSpan="2" Active="True"></wcl:Border>
     </Grid>
 </Window>

Daybreak/Launch/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using Daybreak.Services.Bloogum;
+using Daybreak.Services.Runtime;
 using Daybreak.Services.Screenshots;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
@@ -23,6 +24,7 @@ namespace Daybreak.Launch
     public partial class MainWindow : Window
     {
         public static readonly DependencyProperty CreditTextProperty = DependencyPropertyExtensions.Register<MainWindow, string>(nameof(CreditText));
+        public static readonly DependencyProperty CurrentVersionTextProperty = DependencyPropertyExtensions.Register<MainWindow, string>(nameof(CurrentVersionText));
 
         private readonly IViewManager viewManager;
         private readonly IScreenshotProvider screenshotProvider;
@@ -36,6 +38,12 @@ namespace Daybreak.Launch
             set => this.SetValue(CreditTextProperty, value);
         }
 
+        public string CurrentVersionText
+        {
+            get => this.GetTypedValue<string>(CurrentVersionTextProperty);
+            set => this.SetValue(CurrentVersionTextProperty, value);
+        }
+
         public MainWindow(
             IViewManager viewManager,
             IScreenshotProvider screenshotProvider,
@@ -46,7 +54,8 @@ namespace Daybreak.Launch
             this.screenshotProvider = screenshotProvider.ThrowIfNull(nameof(screenshotProvider));
             this.bloogumClient = bloogumClient.ThrowIfNull(nameof(bloogumClient));
             this.applicationUpdater = applicationUpdater.ThrowIfNull(nameof(applicationUpdater));
-            InitializeComponent();
+            this.InitializeComponent();
+            this.CurrentVersionText = this.applicationUpdater.CurrentVersion;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -123,7 +132,7 @@ namespace Daybreak.Launch
             this.viewManager.ShowView<SettingsCategoryView>();
         }
 
-        private void CreditTextBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void CreditTextBox_MouseLeftButtonDown(object sender, EventArgs e)
         {
             if (Uri.TryCreate(this.CreditText, UriKind.Absolute, out var uri))
             {
@@ -165,13 +174,7 @@ namespace Daybreak.Launch
 
         private void PeriodicallyCheckForUpdates()
         {
-            TaskExtensions.RunPeriodicAsync(async () =>
-            {
-                if (await this.applicationUpdater.UpdateAvailable())
-                {
-                    this.Dispatcher.Invoke(() => this.viewManager.ShowView<AskUpdateView>());
-                }
-            }, TimeSpan.FromMinutes(15), TimeSpan.FromMinutes(15), CancellationToken.None);
+            this.applicationUpdater.PeriodicallyCheckForUpdates();
         }
 
         private static Color GetAverageColor(BitmapSource bitmap)

Daybreak/Services/Runtime/IRuntimeStore.cs

@@ -0,0 +1,9 @@
+namespace Daybreak.Services.Runtime
+{
+    public interface IRuntimeStore
+    {
+        void StoreValue<T>(string name, T value);
+        bool TryGetValue<T>(string name, out T value);
+        T GetValue<T>(string name);
+    }
+}

Daybreak/Services/Runtime/RuntimeStore.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Extensions;
+
+namespace Daybreak.Services.Runtime
+{
+    public sealed class RuntimeStore : IRuntimeStore
+    {
+        private Dictionary<string, object> InnerStore { get; } = new Dictionary<string, object>();
+
+        public T GetValue<T>(string name)
+        {
+            if(this.InnerStore.TryGetValue(name, out var value))
+            {
+                return value.Cast<T>();
+            }
+
+            throw new InvalidOperationException($"Could not find any value stored with name {name}");
+        }
+        public void StoreValue<T>(string name, T value)
+        {
+            this.InnerStore[name] = value;
+        }
+        public bool TryGetValue<T>(string name, out T value)
+        {
+            if (this.InnerStore.TryGetValue(name, out var valueObj))
+            {
+                value = valueObj.Cast<T>();
+                return true;
+            }
+
+            value = default;
+            return false;
+        }
+    }
+}

Daybreak/Services/Updater/ApplicationUpdater.cs

@@ -1,6 +1,9 @@
 using Daybreak.Models;
 using Daybreak.Services.Logging;
+using Daybreak.Services.Runtime;
+using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
+using Daybreak.Views;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
@@ -10,12 +13,15 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Daybreak.Services.Updater
 {
     public sealed class ApplicationUpdater : IApplicationUpdater
     {
+        private const string UpdateDesiredKey = "UpdateDesired";
         private const string ExecutionPolicyKey = "ExecutionPolicy";
         private const string UpdatedKey = "Updating";
         private const string RegistryKey = "Daybreak";
@@ -36,13 +42,21 @@ namespace Daybreak.Services.Updater
         private const string RemoveTempFile = $"Remove-item {TempFile}";
         private const string RemovePs1 = $"Remove-item {ExtractAndRunPs1}";
 
+        private readonly CancellationTokenSource updateCancellationTokenSource = new();
         private readonly ILogger logger;
+        private readonly IViewManager viewManager;
+        private readonly IRuntimeStore runtimeStore;
         private readonly HttpClient httpClient = new();
 
         public string CurrentVersion => Assembly.GetExecutingAssembly().GetName().Version.ToString();
 
-        public ApplicationUpdater(ILogger logger)
+        public ApplicationUpdater(
+            ILogger logger,
+            IRuntimeStore runtimeStore,
+            IViewManager viewManager)
         {
+            this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
+            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
             this.logger = logger.ThrowIfNull(nameof(logger));
         }
 
@@ -104,6 +118,23 @@ namespace Daybreak.Services.Updater
                 }).ExtractValue();
         }
 
+        public void PeriodicallyCheckForUpdates()
+        {
+            System.Extensions.TaskExtensions.RunPeriodicAsync(async () =>
+            {
+                if (this.runtimeStore.TryGetValue<bool>(UpdateDesiredKey, out var desiringUpdate) && desiringUpdate is false)
+                {
+                    this.updateCancellationTokenSource.Cancel();
+                    return;
+                }
+
+                if (await this.UpdateAvailable())
+                {
+                    Application.Current.Dispatcher.Invoke(() => this.viewManager.ShowView<AskUpdateView>());
+                }
+            }, TimeSpan.FromMinutes(15), TimeSpan.FromMinutes(15), this.updateCancellationTokenSource.Token);
+        }
+
         public void FinalizeUpdate()
         {
             var maybeExecutionPolicy = this.RetrieveExecutionPolicy();

Daybreak/Services/Updater/IApplicationUpdater.cs

@@ -8,6 +8,7 @@ namespace Daybreak.Services.Updater
     {
         string CurrentVersion { get; }
         void FinalizeUpdate();
+        void PeriodicallyCheckForUpdates();
         Task<bool> UpdateAvailable();
         Task<bool> DownloadUpdate(UpdateStatus updateStatus);
     }

Daybreak/Views/AskUpdateView.xaml.cs

@@ -1,4 +1,5 @@
 using Daybreak.Services.Logging;
+using Daybreak.Services.Runtime;
 using Daybreak.Services.Updater;
 using Daybreak.Services.ViewManagement;
 using Daybreak.Utils;
@@ -12,27 +13,34 @@ namespace Daybreak.Views
     /// </summary>
     public partial class AskUpdateView : UserControl
     {
+        private const string UpdateDesiredKey = "UpdateDesired";
+
         private readonly ILogger logger;
         private readonly IViewManager viewManager;
+        private readonly IRuntimeStore runtimeStore;
 
         public AskUpdateView(
             ILogger logger,
-            IViewManager viewManager)
+            IViewManager viewManager,
+            IRuntimeStore runtimeStore)
         {
             this.logger = logger.ThrowIfNull(nameof(logger));
             this.viewManager = viewManager.ThrowIfNull(nameof(viewManager));
+            this.runtimeStore = runtimeStore.ThrowIfNull(nameof(runtimeStore));
             this.InitializeComponent();
         }
 
         private void NoButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User declined update");
+            this.runtimeStore.StoreValue(UpdateDesiredKey, false);
             this.viewManager.ShowView<MainView>();
         }
 
         private void YesButton_Clicked(object sender, System.EventArgs e)
         {
             this.logger.LogInformation("User accepted update");
+            this.runtimeStore.StoreValue(UpdateDesiredKey, true);
             this.viewManager.ShowView<UpdateView>();
         }
     }

Daybreak/Views/MainView.xaml

@@ -14,7 +14,7 @@
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibility"></BooleanToVisibilityConverter>
     </UserControl.Resources>
-    <Grid Background="Transparent" x:Name="ViewContainer">
+    <Grid x:Name="ViewContainer">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
@@ -27,15 +27,18 @@
         <controls:OpaqueButton Text="Launch game" Highlight="White" TransparentBackground="Black" HighlightOpacity="0.3" BackgroundOpacity="0.2"
                                Foreground="White" FontSize="36" Width="250" Height="60" VerticalAlignment="Bottom"
                                IsEnabled="{Binding ElementName=_this, Path=LaunchButtonEnabled, Mode=OneWay}"
-                               Clicked="LaunchButton_Clicked" Grid.Row="0" Grid.ColumnSpan="3"></controls:OpaqueButton>
+                               Clicked="LaunchButton_Clicked" Grid.Row="0" Grid.ColumnSpan="3"
+                               Visibility="{Binding ElementName=_this, Path=ButtonsVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}"></controls:OpaqueButton>
         <controls:OpaqueButton Text="Launch toolbox" Highlight="White" TransparentBackground="Black" HighlightOpacity="0.3" BackgroundOpacity="0.2"
                                Foreground="White" FontSize="24" Width="200" Height="40" Margin="0, 10, 0, 10"
                                IsEnabled="{Binding ElementName=_this, Path=LaunchToolboxButtonEnabled, Mode=OneWay}"
-                               Clicked="LaunchToolboxButton_Clicked" Grid.Row="1" Grid.ColumnSpan="2"></controls:OpaqueButton>
+                               Clicked="LaunchToolboxButton_Clicked" Grid.Row="1" Grid.ColumnSpan="2"
+                               Visibility="{Binding ElementName=_this, Path=ButtonsVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}"></controls:OpaqueButton>
         <controls:OpaqueButton Text="Launch texmod" Highlight="White" TransparentBackground="Black" HighlightOpacity="0.3" BackgroundOpacity="0.2"
                                Foreground="White" FontSize="24" Width="200" Height="40" Margin="0, 10, 0, 10"
                                IsEnabled="{Binding ElementName=_this, Path=LaunchTexmodButtonEnabled, Mode=OneWay}"
-                               Clicked="LaunchTexmodButton_Clicked" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1"></controls:OpaqueButton>
+                               Clicked="LaunchTexmodButton_Clicked" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1"
+                               Visibility="{Binding ElementName=_this, Path=ButtonsVisible, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}"></controls:OpaqueButton>
         <Grid Grid.Column="2" Margin="10" Visibility="{Binding ElementName=_this, Path=BrowsersEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}">
             <controls:ChromiumBrowserWrapper Address="{Binding ElementName=_this, Path=RightBrowserAddress, Mode=OneWay}"
                                              Foreground="White" FavoriteUriChanged="RightBrowser_FavoriteUriChanged"

Daybreak/Views/MainView.xaml.cs

@@ -18,6 +18,8 @@ namespace Daybreak.Views
     /// </summary>
     public partial class MainView : UserControl
     {
+        public static readonly DependencyProperty ButtonsVisibleProperty =
+            DependencyPropertyExtensions.Register<MainView, bool>(nameof(ButtonsVisible), new PropertyMetadata(true));
         public static readonly DependencyProperty LaunchButtonEnabledProperty =
             DependencyPropertyExtensions.Register<MainView, bool>(nameof(LaunchButtonEnabled));
         public static readonly DependencyProperty LaunchToolboxButtonEnabledProperty =
@@ -43,6 +45,11 @@ namespace Daybreak.Views
         private bool leftBrowserMaximized = false;
         private bool rightBrowserMaximized = false;
 
+        public bool ButtonsVisible
+        {
+            get => this.GetTypedValue<bool>(ButtonsVisibleProperty);
+            set => this.SetTypedValue(ButtonsVisibleProperty, value);
+        }
         public string RightBrowserFavoriteAddress
         {
             get => this.GetTypedValue<string>(RightBrowserFavoriteAddressProperty);
@@ -210,6 +217,7 @@ namespace Daybreak.Views
             }
 
             this.leftBrowserMaximized = !this.leftBrowserMaximized;
+            this.ButtonsVisible = !this.leftBrowserMaximized;
         }
 
         private void RightChromiumBrowserWrapper_MaximizeClicked(object sender, EventArgs e)
@@ -228,6 +236,7 @@ namespace Daybreak.Views
             }
 
             this.rightBrowserMaximized = !this.rightBrowserMaximized;
+            this.ButtonsVisible = !this.rightBrowserMaximized;
         }
     }
 }