Merge branch '#79_Updater_Window_Restyle'

Author: maxijabase

Interop/Updater/UpdateCheck.cs

@@ -71,8 +71,8 @@ private static bool IsUpToDate(Version currentVer, Version latestVer)
         private static async Task<Release> GetLatest()
         {
             var client = new GitHubClient(new ProductHeaderValue("spcode-client"));
-            var releases = await client.Repository.Release.GetAll("Hexer10", "SPCode");
-            return releases[0];
+            var latestRelease = await client.Repository.Release.GetLatest("Hexer10", "SPCode");
+            return latestRelease;
         }
     }
 }

Interop/Updater/UpdateWindow.xaml

@@ -2,9 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             Width="500" Height="200" ResizeMode="NoResize" ShowInTaskbar="False" WindowStyle="None" ShowTitleBar="False" GlowBrush="{DynamicResource AccentColorBrush}"
-                     ShowCloseButton="False" WindowStartupLocation="CenterOwner" >
+             Width="500" Height="400" TitleCaps="False" ShowInTaskbar="False" GlowBrush="{DynamicResource AccentColorBrush}" WindowStartupLocation="CenterOwner" WindowStyle="None" >
     <mahapps:MetroWindow.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -17,11 +15,13 @@
         </ResourceDictionary>
     </mahapps:MetroWindow.Resources>
     <Grid>
+        <Image Name="Icon" Source="/SPCode;component/Resources/Icon.ico" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,5,5" Width="40" Height="40"/>
         <mahapps:ProgressRing Name="Progress" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,5,5" Width="40" Height="40" IsActive="False" IsLarge="False" IsHitTestVisible="False" />
-        <TextBlock Name="MainLine" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="50,0,0,0" FontSize="16" Foreground="{StaticResource AccentColorBrush}" Text="An update is available. Do you want to update?" IsHitTestVisible="False" />
+        <TextBlock Name="MainLine" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="50,0,0,0" FontSize="16" Foreground="{StaticResource AccentColorBrush}" Text="Update now?" IsHitTestVisible="False" />
         <TextBlock Name="SubLine" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="50,25,0,0" FontSize="14" IsHitTestVisible="False" />
         <Button Name="ActionYesButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="50,25,0,0" Content="Yes" Width="50" Click="ActionYesButton_Click" />
         <Button Name="ActionNoButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="110,25,0,0" Content="No" Width="50" Click="ActionNoButton_Click" />
-        <TextBox Name="DescriptionBox" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,55,0,0" Height="145" VerticalScrollBarVisibility="Visible" IsReadOnly="True" />
-    </Grid>
+        <RichTextBox Name="DescriptionBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,55,0,0" VerticalScrollBarVisibility="Visible" IsReadOnly="True" />
+    <Button x:Name="ActionGithubButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="170,25,0,0" Content="View on Github" Width="110" Click="ActionGithubButton_Click" />
+  </Grid>
 </mahapps:MetroWindow>

Interop/Updater/UpdateWindow.xaml.cs

@@ -2,9 +2,13 @@
 using System.Diagnostics;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Threading;
 using System.Windows;
+using System.Windows.Controls;
+using Markdig;
 using Octokit;
+using SPCode.Utils;
 
 namespace SPCode.Interop.Updater
 {
@@ -21,11 +25,13 @@ public UpdateWindow()
             InitializeComponent();
         }
 
-        public UpdateWindow(UpdateInfo info)
+        public UpdateWindow(UpdateInfo info) : this()
         {
             updateInfo = info;
-            InitializeComponent();
-            DescriptionBox.Text = updateInfo.Release.Body;
+
+            Title = $"Version {info.Release.TagName} is available for download!";
+            DescriptionBox.AppendText(Markdown.ToPlainText(updateInfo.Release.Body));
+            
             if (info.SkipDialog)
             {
                 StartUpdate();
@@ -52,9 +58,10 @@ private void StartUpdate()
 
             ActionYesButton.Visibility = Visibility.Hidden;
             ActionNoButton.Visibility = Visibility.Hidden;
+            Icon.Visibility = Visibility.Hidden;
             Progress.IsActive = true;
             MainLine.Text = "Updating to " + updateInfo.Release.TagName;
-            SubLine.Text = "Downloading Updater";
+            SubLine.Text = "Downloading updater...";
             var t = new Thread(UpdateDownloadWorker);
             t.Start();
         }
@@ -110,5 +117,10 @@ private void FinalizeUpdate()
 
             Close();
         }
+
+        private void ActionGithubButton_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start(new ProcessStartInfo(Constants.GitHubLatestRelease));
+        }
     }
 }

Spcode.csproj

@@ -85,6 +85,9 @@
       <HintPath>packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Markdig, Version=0.23.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Markdig.0.23.0\lib\net452\Markdig.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.4.0, Culture=neutral, PublicKeyToken=8985beaab7ea3f04, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft-WindowsAPICodePack-Core.1.1.4\lib\net48\Microsoft.WindowsAPICodePack.dll</HintPath>

Utils/Constants.cs

@@ -3,6 +3,7 @@
     public class Constants
     {
         public static string GitHubNewIssueLink = "https://github.com/Hexer10/SPCode/issues/new";
+        public static string GitHubLatestRelease = "https://github.com/Hexer10/SPCode/releases/latest";
         public static string DiscordRPCAppID = "692110664948514836";
         public static string JavaDownloadSite64 = "https://api.adoptopenjdk.net/v3/installer/latest/15/ga/windows/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk";
         public static string JavaDownloadSite32 = "https://api.adoptopenjdk.net/v3/installer/latest/15/ga/windows/x32/jdk/hotspot/normal/adoptopenjdk?project=jdk";

packages.config

@@ -6,7 +6,8 @@
   <package id="DiscordRichPresence" version="1.0.150" targetFramework="net45" />
   <package id="Extended.Wpf.Toolkit" version="2.9" targetFramework="net45" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net45" />
-  <package id="Microsoft-WindowsAPICodePack-Core" version="1.1.4" targetFramework="net48" />	
+  <package id="Markdig" version="0.23.0" targetFramework="net48" />
+  <package id="Microsoft-WindowsAPICodePack-Core" version="1.1.4" targetFramework="net48" />
   <package id="Microsoft-WindowsAPICodePack-Shell" version="1.1.4" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
   <package id="Octokit" version="0.46.0" targetFramework="net48" />