V2021.12.2

- Moved status to a bar at the bottom - Updated dependencies
NickvisionApps · Dec 24, 2021 · 3297d79 · 3297d79
1 parent bf7638d
commit 3297d79
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/Installer.iss b/Installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Nickvision Spotlight"
-#define MyAppVersion "2021.12.1"
+#define MyAppVersion "2021.12.2"
 #define MyAppPublisher "Nickvision"
 #define MyAppURL "https://github.com/nlogozzo/NickvisionSpotlight"
 #define MyAppExeName "NickvisionSpotlight.exe"

diff --git a/NickvisionSpotlight/NickvisionSpotlight.csproj b/NickvisionSpotlight/NickvisionSpotlight.csproj
@@ -18,13 +18,13 @@
     <Content Include="Resources\icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
+    <PackageReference Include="Avalonia" Version="0.10.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.11" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.10.4" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.1.7" />
-    <PackageReference Include="Nickvision.Avalonia" Version="2021.12.5" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.11" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.11.5" />
+    <PackageReference Include="FluentAvaloniaUI" Version="1.1.8" />
+    <PackageReference Include="Nickvision.Avalonia" Version="2021.12.6" />
    </ItemGroup>
   <ItemGroup>
     <Compile Update="Views\SettingsDialogView.axaml.cs">

diff --git a/NickvisionSpotlight/ViewModels/MainWindowViewModel.cs b/NickvisionSpotlight/ViewModels/MainWindowViewModel.cs
@@ -171,7 +171,7 @@ private async Task SyncSpotlightImages(object parameter)
 
         private async Task CheckForUpdates(ICloseable window)
         {
-            var updater = new Updater(_httpClient, new Uri("https://raw.githubusercontent.com/nlogozzo/NickvisionSpotlight/main/UpdateConfig.json"), new Version("2021.12.1"));
+            var updater = new Updater(_httpClient, new Uri("https://raw.githubusercontent.com/nlogozzo/NickvisionSpotlight/main/UpdateConfig.json"), new Version("2021.12.2"));
             await _serviceCollection.GetService<IProgressDialogService>().ShowAsync("Checking for updates...", async () => await updater.CheckForUpdatesAsync());
             if (updater.UpdateAvailable)
             {
@@ -216,7 +216,7 @@ private async Task Changelog(object parameter)
             await _serviceCollection.GetService<IContentDialogService>().ShowMessageAsync(new ContentDialogInfo()
             {
                 Title = "What's New?",
-                Description  = "- Design Tweaks\n- Fixed an issue where the old image stayed selected after a re-sync",
+                Description  = "- Moved status to a bar at the bottom\n- Updated dependencies",
                 CloseButtonText = "OK",
                 DefaultButton = ContentDialogButton.Close
             });
@@ -227,7 +227,7 @@ private async Task About(object parameter)
             await _serviceCollection.GetService<IContentDialogService>().ShowMessageAsync(new ContentDialogInfo()
             {
                 Title = "About",
-                Description  = "Nickvision Spotlight Version 2021.12.1\nA utility for working with Windows Spotlight images.\n\nUsing Avalonia and .NET 6",
+                Description  = "Nickvision Spotlight Version 2021.12.2\nA utility for working with Windows Spotlight images.\n\nUsing Avalonia and .NET 6",
                 CloseButtonText = "OK",
                 DefaultButton = ContentDialogButton.Close
             });

diff --git a/NickvisionSpotlight/Views/MainWindowView.axaml b/NickvisionSpotlight/Views/MainWindowView.axaml
@@ -98,13 +98,7 @@
 		</Menu>
 
 		<ui:CommandBar HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,40,0,0" DefaultLabelPosition="Right">
-			<ui:CommandBar.Content>
-				<TextBlock Margin="6,12,6,0" Text="{Binding Status}"/>
-			</ui:CommandBar.Content>
-
 			<ui:CommandBar.PrimaryCommands>
-				<ui:CommandBarSeparator />
-
 				<ui:CommandBarButton Label="Sync Spotlight Images" Icon="Sync" Command="{Binding SyncSpotlightImagesCommand}"/>
 
 				<ui:CommandBarSeparator />
@@ -121,17 +115,23 @@
 
 		<Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,90,0,0" Background="{DynamicResource CommandBarBackgroundOpen}" CornerRadius="6">
 			<Grid>
-				<Border HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="6,6,0,6" Width="340" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
+				<Border HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="6,6,0,46" Width="340" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
 					<ListBox Margin="6,6,6,6" SelectionMode="Single" Items="{Binding SpotlightImages}" SelectedItem="{Binding SelectedImage}"/>
 				</Border>
 
-				<Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="350,6,6,6" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
+				<Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="350,6,6,46" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
 					<Grid>
 						<Image HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="6,6,6,6" Stretch="Uniform" Source="{Binding SelectedImageSource}"/>
 
 						<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsImageNotSelected}" FontSize="16" Text="Please sync then select an image."/>
 					</Grid>
 				</Border>
+
+				<Border HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="6,0,6,6" Height="36" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
+					<Grid>
+						<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6,6,0,0" Text="{Binding Status}"/>
+					</Grid>
+				</Border>
 			</Grid>
 		</Border>
 

diff --git a/UpdateConfig.json b/UpdateConfig.json
@@ -1 +1 @@
-{"LatestVersion":"2021.12.1","Changelog":"- Design Tweaks\n- Fixed an issue where the old image stayed selected after a re-sync","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionSpotlight/releases/download/2021.12.1/NickvisionSpotlightSetup.exe"}
+{"LatestVersion":"2021.12.2","Changelog":"- Moved status to a bar at the bottom\n- Updated dependencies","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionSpotlight/releases/download/2021.12.2/NickvisionSpotlightSetup.exe"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"LatestVersion":"2021.12.1","Changelog":"- Design Tweaks\n- Fixed an issue where the old image stayed selected after a re-sync","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionSpotlight/releases/download/2021.12.1/NickvisionSpotlightSetup.exe"}
		{"LatestVersion":"2021.12.2","Changelog":"- Moved status to a bar at the bottom\n- Updated dependencies","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionSpotlight/releases/download/2021.12.2/NickvisionSpotlightSetup.exe"}