change version

Nokskiy · Nokskiy · commit 19afd93d22a2 · 2025-12-25T18:58:49.000+05:00
diff --git a/App.axaml.cs b/App.axaml.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonix.Model.Media.MediaPlayer;
-using Avalonix.Model.Media.PlayBox;
 using Avalonix.Services.CacheManager;
 using Avalonix.Services.CommandLineInitializer;
 using Avalonix.Services.DiskLoader;
@@ -76,7 +74,7 @@ public override void OnFrameworkInitializationCompleted()
             DisableAvaloniaDataAnnotationValidation();
             desktop.MainWindow = ServiceProvider.GetRequiredService<MainWindow>();
         }
-        
+
         base.OnFrameworkInitializationCompleted();
     }
 
diff --git a/Avalonix.csproj b/Avalonix.csproj
@@ -10,41 +10,41 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Folder Include="github\" />
-        <AvaloniaResource Include="Assets\**" />
-        <Folder Include="Model\" />
-        <Folder Include="Model\Media\Artist\" />
+        <Folder Include="github\"/>
+        <AvaloniaResource Include="Assets\**"/>
+        <Folder Include="Model\"/>
+        <Folder Include="Model\Media\Artist\"/>
     </ItemGroup>
 
 
     <ItemGroup>
-        <AvaloniaResource Include="Assets\avalonix-logo.ico" />
-        <PackageReference Include="Avalonia" Version="11.3.7" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.3.7" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.7" />
+        <AvaloniaResource Include="Assets\avalonix-logo.ico"/>
+        <PackageReference Include="Avalonia" Version="11.3.7"/>
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.7"/>
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2"/>
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.7"/>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Diagnostics" Version="11.3.7">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.7" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.7"/>
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Material.Avalonia" Version="3.13.4" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.7.25380.108" />
-        <PackageReference Include="NeoSimpleLogger" Version="1.4.0" />
-        <PackageReference Include="radio42.Bass.Net.core" Version="2.4.17.8" />
-        <PackageReference Include="TagLibSharp" Version="2.3.0" />
+        <PackageReference Include="Material.Avalonia" Version="3.13.4"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.7.25380.108"/>
+        <PackageReference Include="NeoSimpleLogger" Version="1.4.0"/>
+        <PackageReference Include="radio42.Bass.Net.core" Version="2.4.17.8"/>
+        <PackageReference Include="TagLibSharp" Version="2.3.0"/>
     </ItemGroup>
 
 
     <ItemGroup>
-        <AdditionalFiles Include="Styles\Default.axaml" />
-        <AdditionalFiles Include="View\SecondaryWindows\PlaylistCreateWindow\PlaylistCreateWindow.axaml" />
+        <AdditionalFiles Include="Styles\Default.axaml"/>
+        <AdditionalFiles Include="View\SecondaryWindows\PlaylistCreateWindow\PlaylistCreateWindow.axaml"/>
     </ItemGroup>
 
 
diff --git a/Model/Media/MediaPlayer/MediaPlayer.cs b/Model/Media/MediaPlayer/MediaPlayer.cs
@@ -9,6 +9,7 @@ namespace Avalonix.Model.Media.MediaPlayer;
 
 public class MediaPlayer : IMediaPlayer
 {
+    private readonly Lock _lock = new();
     private readonly ILogger _logger;
     private readonly ISettingsManager _settingsManager;
     private int _stream;
@@ -27,7 +28,6 @@ public MediaPlayer(ILogger logger, ISettingsManager settingsManager)
 
     public event Action<bool>? PlaybackStateChanged;
     public event Action? TrackChanged;
-    private readonly Lock _lock = new();
 
     public void Play(Track.Track track)
     {
@@ -57,7 +57,6 @@ public void Play(Track.Track track)
             PlaybackStateChanged?.Invoke(false);
             TrackChanged?.Invoke();
         }
-        
     }
 
     public void Stop()
diff --git a/Program.cs b/Program.cs
@@ -1,16 +1,13 @@
 ﻿#define DEBUG
 using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Avalonia;
 
 namespace Avalonix;
 
 internal static class Program
 {
-    private readonly static string _avalonixPipeName = "Avalonix_FilePipe";
-    
+    private static readonly string _avalonixPipeName = "Avalonix_FilePipe";
+
     [STAThread]
     public static void Main(string[] args)
     {
diff --git a/Services/CommandLineInitializer/CommandLineInitializer.cs b/Services/CommandLineInitializer/CommandLineInitializer.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security.AccessControl;
-using System.Security.Principal;
 using System.Threading;
-using System.Threading.Tasks;
 using Avalonix.Model.Media.MediaPlayer;
 using Avalonix.Model.Media.PlayBox;
 using Avalonix.Services.CacheManager;
diff --git a/Services/VersionManager/VersionManager.cs b/Services/VersionManager/VersionManager.cs
@@ -8,7 +8,7 @@ public class VersionManager : IVersionManager
 {
     private const string ReleaseUrl = "https://github.com/AvalonixPlayer/Avalonix/blob/main/Release";
 
-    public Release CurrentRelease => new("2.1.2");
+    public Release CurrentRelease => new("2.2.0");
 
     public async Task<Release> GetLastRelease()
     {
diff --git a/Styles/Controls/Buttons.axaml b/Styles/Controls/Buttons.axaml
@@ -1,6 +1,6 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
+
     <Style Selector="Button">
         <Setter Property="Background" Value="{DynamicResource ButtonsColor}" />
         <Setter Property="ClipToBounds" Value="False" />
diff --git a/Styles/Controls/Slider.axaml b/Styles/Controls/Slider.axaml
@@ -1,7 +1,7 @@
 <Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-       <Style Selector="Slider">
-              <Setter Property="Width" Value="120" />
-              <Setter Property="Height" Value="30" />
-       </Style>
+    <Style Selector="Slider">
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="30" />
+    </Style>
 </Style>
diff --git a/Styles/Controls/TextBoxes.axaml b/Styles/Controls/TextBoxes.axaml
@@ -5,6 +5,6 @@
         <Setter Property="FontWeight" Value="DemiBold" />
         <Setter Property="MinWidth" Value="250" />
         <Setter Property="MinHeight" Value="60" />
-        <Setter Property="MaxWidth" Value="300"></Setter>
+        <Setter Property="MaxWidth" Value="300" />
     </Style>
 </Style>
diff --git a/Styles/Default.axaml b/Styles/Default.axaml
@@ -11,7 +11,7 @@
     <StyleInclude Source="Controls/TextBoxes.axaml" />
     <StyleInclude Source="Controls/Slider.axaml" />
     <Style Selector="ListBox">
-        <Setter Property="Background" Value="{DynamicResource PanelsColor}"></Setter>
-        <Setter Property="CornerRadius" Value="10"></Setter>
+        <Setter Property="Background" Value="{DynamicResource PanelsColor}" />
+        <Setter Property="CornerRadius" Value="10" />
     </Style>
 </Styles>
diff --git a/View/MainWindow.axaml.cs b/View/MainWindow.axaml.cs
@@ -105,7 +105,7 @@ public MainWindow(ILogger<MainWindow> logger, IMainWindowViewModel vm, ICommandL
         _mainGridColumnsDefinitionBase = MainGrid.ColumnDefinitions.ToString();
 
         _logger.LogInformation("MainWindow initialized");
-        
+
         cli.Initialize();
     }
 
diff --git a/View/SecondaryWindows/PlayableSelectWindow/PlaylistSelectWindow.axaml.cs b/View/SecondaryWindows/PlayableSelectWindow/PlaylistSelectWindow.axaml.cs
@@ -51,7 +51,7 @@ private async void ActionSelectedPlaylist(object? sender, SelectionChangedEventA
         {
             var castedSender = (ListBox)sender!;
             _logger.LogInformation(castedSender.SelectedItem?.ToString());
-            
+
             var searchBoxText = SearchBox.Text;
             var playablesResult = string.IsNullOrWhiteSpace(searchBoxText)
                 ? _playables
diff --git a/setup.iss b/setup.iss
@@ -3,7 +3,7 @@
 ; Non-commercial use only
 
 #define MyAppName "Avalonix"
-#define MyAppVersion "2.1.2"
+#define MyAppVersion "2.2.0"
 #define MyAppPublisher "Avalonix Player"
 #define MyAppURL "https://github.com/AvalonixPlayer/Avalonix"
 #define MyAppExeName "Avalonix.exe"

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace Avalonix.Model.Media.MediaPlayer;`
`9`	`9`
`10`	`10`	`public class MediaPlayer : IMediaPlayer`
`11`	`11`	`{`
	`12`	`+ private readonly Lock _lock = new();`
`12`	`13`	`private readonly ILogger _logger;`
`13`	`14`	`private readonly ISettingsManager _settingsManager;`
`14`	`15`	`private int _stream;`
`@@ -27,7 +28,6 @@ public MediaPlayer(ILogger logger, ISettingsManager settingsManager)`
`27`	`28`
`28`	`29`	`public event Action<bool>? PlaybackStateChanged;`
`29`	`30`	`public event Action? TrackChanged;`
`30`		`- private readonly Lock _lock = new();`
`31`	`31`
`32`	`32`	`public void Play(Track.Track track)`
`33`	`33`	`{`
`@@ -57,7 +57,6 @@ public void Play(Track.Track track)`
`57`	`57`	`PlaybackStateChanged?.Invoke(false);`
`58`	`58`	`TrackChanged?.Invoke();`
`59`	`59`	`}`
`60`		`-`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`public void Stop()`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class VersionManager : IVersionManager`
`8`	`8`	`{`
`9`	`9`	`private const string ReleaseUrl = "https://github.com/AvalonixPlayer/Avalonix/blob/main/Release";`
`10`	`10`
`11`		`- public Release CurrentRelease => new("2.1.2");`
	`11`	`+ public Release CurrentRelease => new("2.2.0");`
`12`	`12`
`13`	`13`	`public async Task<Release> GetLastRelease()`
`14`	`14`	`{`