Skip to content

Commit

Permalink
V2021.12.2
Browse files Browse the repository at this point in the history
- Moved status to a bar at the bottom
- Updated dependencies
  • Loading branch information
nlogozzo committed Dec 24, 2021
1 parent 49e3167 commit 6b352d4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Nickvision Tube Converter"
#define MyAppVersion "2021.12.1"
#define MyAppVersion "2021.12.2"
#define MyAppPublisher "Nickvision"
#define MyAppURL "https://github.com/nlogozzo/NickvisionTubeConverter"
#define MyAppExeName "NickvisionTubeConverter.exe"
Expand Down
12 changes: 6 additions & 6 deletions NickvisionTubeConverter/NickvisionTubeConverter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
<PackageReference Include="VideoLibrary" Version="3.1.4" />
<PackageReference Include="WebViewControl-Avalonia" Version="2.91.12" />
<PackageReference Include="Xabe.FFmpeg" Version="3.6.2" />
Expand Down
6 changes: 3 additions & 3 deletions NickvisionTubeConverter/ViewModels/MainWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private void ClearCompletedDownloads(object parameter)

private async Task CheckForUpdates(ICloseable window)
{
var updater = new Updater(_httpClient, new Uri("https://raw.githubusercontent.com/nlogozzo/NickvisionTubeConverter/main/UpdateConfig.json"), new Version("2021.12.1"));
var updater = new Updater(_httpClient, new Uri("https://raw.githubusercontent.com/nlogozzo/NickvisionTubeConverter/main/UpdateConfig.json"), new Version("2021.12.2"));
await _serviceCollection.GetService<IProgressDialogService>().ShowAsync("Checking for updates...", async () => await updater.CheckForUpdatesAsync());
if (updater.UpdateAvailable)
{
Expand Down Expand Up @@ -323,7 +323,7 @@ private async Task Changelog(object parameter)
await _serviceCollection.GetService<IContentDialogService>().ShowMessageAsync(new ContentDialogInfo()
{
Title = "What's New?",
Description = "- Design Tweaks",
Description = "- Moved status to a bar at the bottom\n- Updated dependencies",
CloseButtonText = "OK",
DefaultButton = ContentDialogButton.Close
});
Expand All @@ -334,7 +334,7 @@ private async Task About(object parameter)
await _serviceCollection.GetService<IContentDialogService>().ShowMessageAsync(new ContentDialogInfo()
{
Title = "About",
Description = "Nickvision Tube Converter Version 2021.12.1\nAn easy-to-use YouTube video downloader.\n\nUsing Avalonia and .NET 6",
Description = "Nickvision Tube Converter Version 2021.12.2\nAn easy-to-use YouTube video downloader.\n\nUsing Avalonia and .NET 6",
CloseButtonText = "OK",
DefaultButton = ContentDialogButton.Close
});
Expand Down
16 changes: 8 additions & 8 deletions NickvisionTubeConverter/Views/MainWindowView.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,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="Select Save Folder" Icon="OpenLocal" Command="{Binding SelectSaveFolderCommand}"/>

<ui:CommandBarButton Label="Download Video" Icon="Download" Command="{Binding DownloadVideoCommand}"/>
Expand All @@ -154,7 +148,7 @@

<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">
<ScrollViewer>
<StackPanel Margin="0,0,0,6">
<TextBlock HorizontalAlignment="Left" Margin="12,10,0,0" Text="Video URL"/>
Expand All @@ -176,7 +170,7 @@
</ScrollViewer>
</Border>

<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="350,6,6,6">
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="350,6,6,46">
<DockPanel LastChildFill="True">
<Border DockPanel.Dock="Top" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" CornerRadius="6">
<webview:WebView Name="WebView" Margin="6,6,6,6" MinHeight="500" Address="{Binding VideoURL}"/>
Expand Down Expand Up @@ -205,6 +199,12 @@
</Border>
</DockPanel>
</ScrollViewer>

<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>

Expand Down
2 changes: 1 addition & 1 deletion UpdateConfig.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"LatestVersion":"2021.12.1","Changelog":"- Design Tweaks","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionTubeConverter/releases/download/2021.12.1/NickvisionTubeConverterSetup.exe"}
{"LatestVersion":"2021.12.2","Changelog":"- Moved status to a bar at the bottom\n- Updated dependencies","LinkToExeInstaller":"https://github.com/nlogozzo/NickvisionTubeConverter/releases/download/2021.12.2/NickvisionTubeConverterSetup.exe"}

0 comments on commit 6b352d4

Please sign in to comment.