fix(fix all)

Author: Nokskiy

App.axaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonix.Model.Media.MediaPlayer;

Avalonix.csproj

@@ -16,6 +16,7 @@
 
 
     <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.Fonts.Inter" Version="11.3.7" />

View/MainWindow.axaml

@@ -8,7 +8,8 @@
         MinHeight="600" MinWidth="800"
         x:Class="Avalonix.View.MainWindow"
         x:DataType="main1:MainWindowViewModel"
-        Title="Avalonix">
+        Title="Avalonix"
+        Icon="/Assets/avalonix-logo.ico">
 
     <Design.DataContext>
         <main1:MainWindowViewModel />
@@ -107,7 +108,7 @@
                            Orientation="Horizontal" Margin="5,0,5,5"
                            HorizontalAlignment="Left"
                            VerticalAlignment="Top">
-                    <ListBox Name="SongBox" Width="" Height="300"/>
+                    <ListBox Name="SongBox" Width="" Height="300" />
                 </WrapPanel>
             </Grid>
         </Border>
@@ -146,29 +147,29 @@
 
         <Border Grid.Row="1" Grid.Column="1" Height="70">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button Click="ShuffleButton_OnClick" Name="Shuffle"
+                        Width="50" Height="50" Margin="5,0">
+                    <Image Source="../Assets/buttons/EnableSnuffle.png" Width="35" Height="35" />
+                </Button>
+
                 <Button Name="BackButton" Click="PlayTrackBefore_OnClick"
-                        Width="60" Height="60">
-                    <Image Source="../Assets/buttons/back.png" Width="24" Height="24" />
+                        Width="50" Height="50" Margin="5,0">
+                    <Image Source="../Assets/buttons/back.png" Width="35" Height="35" />
                 </Button>
 
                 <Button Name="PauseButton" Click="PauseButton_OnClick"
-                        Width="60" Height="60">
-                    <Image Source="../Assets/buttons/pause.png" Width="24" Height="24" />
+                        Width="50" Height="50" Margin="5,0">
+                    <Image Source="../Assets/buttons/pause.png" Width="35" Height="35" />
                 </Button>
 
                 <Button Name="NextButton" Click="PlayNextTrack"
-                        Width="60" Height="60">
-                    <Image Source="../Assets/buttons/next.png" Width="24" Height="24" />
-                </Button>
-
-                <Button Click="ShuffleButton_OnClick" Name="Shuffle"
-                        Width="60" Height="60">
-                    <Image Source="../Assets/buttons/EnableSnuffle.png" Width="24" Height="24" />
+                        Width="50" Height="50" Margin="5,0">
+                    <Image Source="../Assets/buttons/next.png" Width="35" Height="35" />
                 </Button>
 
                 <Button Click="LoopButton_OnClick" Name="Loop"
-                        Width="60" Height="60">
-                    <Image Source="../Assets/buttons/EnableLoop.png" Width="24" Height="24" />
+                        Width="50" Height="50" Margin="5,0">
+                    <Image Source="../Assets/buttons/EnableLoop.png" Width="35" Height="35" />
                 </Button>
             </StackPanel>
         </Border>

View/SecondaryWindows/AboutWindow/AboutWindow.axaml

@@ -6,7 +6,8 @@
         CanResize="False"
         Width="350" Height="350"
         x:Class="Avalonix.View.SecondaryWindows.AboutWindow.AboutWindow"
-        Title="Avalonix - About">
+        Title="Avalonix - About"
+        Icon="/Assets/avalonix-logo.ico">
 
     <StackPanel Classes="vertical">
         <Border Margin="10">

View/SecondaryWindows/EditMetadataWindow/EditMetadataWindow.axaml

@@ -6,7 +6,8 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="500" Height="700"
         CanResize="False"
-        Title="Avalonix - ">
+        Title="Avalonix - "
+        Icon="/Assets/avalonix-logo.ico">
     <StackPanel Classes="vertical">
         <Border>
             <StackPanel Orientation="Vertical">

View/SecondaryWindows/PlayableSelectWindow/PlaylistSelectWindow.axaml

@@ -7,7 +7,8 @@
         Width="300" Height="600" CanResize="False"
         x:Class="Avalonix.View.SecondaryWindows.PlayableSelectWindow.PlayableSelectWindow"
         x:DataType="playableSelectViewModel1:IPlayableSelectViewModel"
-        Title="Avalonix - Playlist Select">
+        Title="Avalonix - Playlist Select"
+        Icon="/Assets/avalonix-logo.ico">
 
     <Design.DataContext>
         <playableSelectViewModel1:PlayableSelectViewModel />

View/SecondaryWindows/PlaylistCreateWindow/PlaylistCreateWindow.axaml

@@ -7,7 +7,8 @@
         Width="300" Height="700" CanResize="False"
         x:Class="Avalonix.View.SecondaryWindows.PlaylistCreateWindow.PlaylistCreateWindow"
         x:DataType="playlistEditOrCreate:PlaylistEditOrCreateWindowViewModel"
-        Title="Avalonix - ">
+        Title="Avalonix - "
+        Icon="/Assets/avalonix-logo.ico">
 
     <StackPanel Margin="10">
         <Border>

View/SecondaryWindows/ShowTrackWindow/ShowTrackWindow.axaml

@@ -6,7 +6,8 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="500" Height="450"
         CanResize="False"
-        Title="Avalonix - ">
+        Title="Avalonix - "
+        Icon="/Assets/avalonix-logo.ico">
 
     <StackPanel Classes="vertical">
         <Border>

View/SettingsWindow/SettingsWindow.axaml

@@ -6,7 +6,8 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="500" Height="450"
         CanResize="True"
-        Title="Avalonix - Settings">
+        Title="Avalonix - Settings"
+        Icon="/Assets/avalonix-logo.ico">
     <Grid RowDefinitions="*,90">
         <TabControl>
             <TabItem Header="Main">