mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update .NET and dependencies

Browse source
This commit is contained in:
Royce551 2022-03-27 21:37:52 -05:00
parent 9087c0c2ca
commit 371127f25e
13 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/App.axaml
View file

@ -8,7 +8,7 @@
<Application.Styles>
<FluentTheme Mode="Dark"/>
<StyleInclude Source="avares://SIADL.Avalonia/Styles.axaml"/>
<StyleInclude Source="avares://SIADL.Avalonia/DarkTheme.axaml"/>
<Style Selector="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
</Style>

BIN
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Dependencies/SIADL.Avalonia.dll
View file

Binary file not shown.

12
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/FRESHMusicPlayer-Avalonia.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>disable</Nullable>
<ApplicationIcon>icon.ico</ApplicationIcon>
<RootNamespace>FRESHMusicPlayer</RootNamespace>
@ -25,11 +25,11 @@
<None Remove="Assets\settings.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.7" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
<PackageReference Include="Avalonia.Svg.Skia" Version="0.10.7.1" />
<PackageReference Include="Avalonia" Version="0.10.13" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.13" />
<PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" />
<PackageReference Include="DiscordRichPresence" Version="1.0.150" />
<PackageReference Include="FRESHMusicPlayer.Core" Version="4.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/Lyrics.axaml
View file

@ -14,7 +14,7 @@
<Panel>
<controls:BlurryImage ZIndex="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Source="{Binding CoverArt}" BlurLevel="10" Stretch="UniformToFill" Margin="-10"/>
<Rectangle ZIndex="1" Fill="{StaticResource BackgroundColor}" Opacity="0.55"/>
<Rectangle ZIndex="1" Fill="{DynamicResource BackgroundColor}" Opacity="0.55"/>
<Grid ZIndex="2" Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>

6
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/MainWindow.axaml
View file

@ -160,7 +160,7 @@
</Button>
</StackPanel>
<DockPanel LastChildFill="True" ZIndex="0">
<Grid Background="{StaticResource ForegroundColor}" DockPanel.Dock="Bottom" Height="85" Margin="0,10,0,0">
<Grid Background="{DynamicResource ForegroundColor}" DockPanel.Dock="Bottom" Height="85" Margin="0,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="1*" />
@ -179,14 +179,14 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock x:Name="TrackTitleTextBlock" Grid.Row="0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" FontSize="21" FontWeight="Bold" PointerPressed="OpenTrackInfo" ContextMenu="{DynamicResource OverflowMenu}"/>
<TextBlock x:Name="TrackArtistTextBlock" Grid.Row="1" Text="{Binding Artist}" FontSize="12" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock x:Name="TrackArtistTextBlock" Grid.Row="1" Text="{Binding Artist}" FontSize="12" Foreground="{DynamicResource SecondaryTextColor}"/>
<Grid Grid.Row="2" Margin="0,5,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="ProgressIndicator1" Text="{Binding CurrentTime, StringFormat=\{0:mm\\:ss\}}" Foreground="{StaticResource SecondaryTextColor}" Grid.Column="0" FontSize="12" Margin="0,0,2,0"/>
<TextBlock x:Name="ProgressIndicator1" Text="{Binding CurrentTime, StringFormat=\{0:mm\\:ss\}}" Foreground="{DynamicResource SecondaryTextColor}" Grid.Column="0" FontSize="12" Margin="0,0,2,0"/>
<Slider x:Name="ProgressSlider" Height="50" Grid.Column="1" Value="{Binding CurrentTimeSeconds}" Maximum="{Binding TotalTimeSeconds}" Margin="0,-13,0,0"/>
<TextBlock x:Name="ProgressIndicator2" Foreground="{Binding PauseAfterCurrentTrack, Converter={StaticResource PauseAfterCurrentTrackToBrushConverter}}" Grid.Column="2" FontSize="12" Margin="2,0,0,0" PointerPressed="ToggleShowRemainingProgress">
<TextBlock.Text>

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/PlaylistManagement.axaml
View file

@ -21,7 +21,7 @@
<vm:AndValueConverter x:Key="AndValueConverter"/>
</Window.Resources>
<DockPanel>
<DockPanel DockPanel.Dock="Bottom" Background="{StaticResource ForegroundColor}" LastChildFill="False">
<DockPanel DockPanel.Dock="Bottom" Background="{DynamicResource ForegroundColor}" LastChildFill="False">
<Button DockPanel.Dock="Right" Margin="10" Click="OnOKButtonClick">OK</Button>
</DockPanel>

6
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/Settings.axaml
View file

@ -47,8 +47,8 @@
<CheckBox Content="{x:Static resx:Resources.Settings_CheckForUpdates}" IsChecked="{Binding CheckForUpdates}" IsVisible="{Binding IsRunningOnMac}"/>
<TextBlock Text="{x:Static resx:Resources.Settings_RestartNeeded}" Foreground="{StaticResource Green}" IsVisible="{Binding IsRestartNeeded}"/>
<Button Content="{x:Static resx:Resources.RestartNow}" Foreground="{StaticResource Green}" Command="{Binding RestartCommand}" IsVisible="{Binding IsRestartNeeded}"/>
<TextBlock Text="{x:Static resx:Resources.Settings_RestartNeeded}" Foreground="{DynamicResource Green}" IsVisible="{Binding IsRestartNeeded}"/>
<Button Content="{x:Static resx:Resources.RestartNow}" Foreground="{DynamicResource Green}" Command="{Binding RestartCommand}" IsVisible="{Binding IsRestartNeeded}"/>
</StackPanel>
</ScrollViewer>
</TabItem>
@ -59,7 +59,7 @@
<StackPanel>
<Button Content="{x:Static resx:Resources.Settings_Reset}" Command="{Binding ResetSettingsCommand}" Margin="0,10,0,0"/>
<Button Content="{x:Static resx:Resources.Settings_CleanLibrary}" Command="{Binding CleanLibraryCommand}"/>
<Button Content="{x:Static resx:Resources.Settings_NukeLibrary}" Foreground="{StaticResource Green}" Command="{Binding NukeLibraryCommand}"/>
<Button Content="{x:Static resx:Resources.Settings_NukeLibrary}" Foreground="{DynamicResource Green}" Command="{Binding NukeLibraryCommand}"/>
</StackPanel>
</TabItem>
<TabItem Header="{x:Static resx:Resources.Menu_About}">

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/TagEditor/IntegrationDisambiguation.axaml
View file

@ -18,7 +18,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="2" Background="{StaticResource ForegroundColor}" LastChildFill="False">
<DockPanel Grid.Row="2" Background="{DynamicResource ForegroundColor}" LastChildFill="False">
<Button DockPanel.Dock="Right" Content="OK" Margin="10" Command="{Binding OKCommand}"/>
</DockPanel>

28
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/TagEditor/ReleaseIntegrationPage.axaml
View file

@ -18,11 +18,11 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<DockPanel Grid.Row="2" Background="{StaticResource ForegroundColor}" LastChildFill="False">
<DockPanel Grid.Row="2" Background="{DynamicResource ForegroundColor}" LastChildFill="False">
<Button DockPanel.Dock="Right" Content="OK" Margin="10" Command="{Binding OKCommand}"/>
</DockPanel>
<Grid Background="{StaticResource BackgroundColor}">
<Grid Background="{DynamicResource BackgroundColor}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@ -33,7 +33,7 @@
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid Margin="0,5,0,0" Background="{StaticResource BackgroundColor}" Grid.Row="0" Grid.ColumnSpan="2">
<Grid Margin="0,5,0,0" Background="{DynamicResource BackgroundColor}" Grid.Row="0" Grid.ColumnSpan="2">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
@ -46,23 +46,23 @@
<ColumnDefinition SharedSizeGroup="centerColumn" Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Margin="20,2,5,2" Grid.Row="1" TextTrimming="WordEllipsis" IsVisible="{Binding ArtistShouldBeVisible}" Text="{x:Static resx:Resources.Artist}" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock Margin="20,2,5,2" Grid.Row="3" TextTrimming="WordEllipsis" IsVisible="{Binding YearShouldBeVisible}" Text="{x:Static resx:Resources.Year}" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock Margin="20,2,5,2" Grid.Row="4" TextTrimming="WordEllipsis" IsVisible="{Binding GenreShouldBeVisible}" Text="{x:Static resx:Resources.Genre}" Foreground="{StaticResource SecondaryTextColor}" />
<TextBlock Margin="20,2,5,2" Grid.Row="5" TextTrimming="WordEllipsis" IsVisible="{Binding AlbumShouldBeVisible}" Text="{x:Static resx:Resources.Album}" Foreground="{StaticResource SecondaryTextColor}" />
<TextBlock Grid.Row="1" Grid.Column="2" Foreground="{StaticResource PrimaryTextColor}" Text="{Binding Artist}" IsVisible="{Binding ArtistShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="3" Grid.Column="2" Foreground="{StaticResource PrimaryTextColor}" Text="{Binding Year}" IsVisible="{Binding YearShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="4" Grid.Column="2" Foreground="{StaticResource PrimaryTextColor}" Text="{Binding Genre}" IsVisible="{Binding GenreShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="5" Grid.Column="2" Foreground="{StaticResource PrimaryTextColor}" Text="{Binding Album}" IsVisible="{Binding AlbumShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Margin="20,2,5,2" Grid.Row="1" TextTrimming="WordEllipsis" IsVisible="{Binding ArtistShouldBeVisible}" Text="{x:Static resx:Resources.Artist}" Foreground="{DynamicResource SecondaryTextColor}"/>
<TextBlock Margin="20,2,5,2" Grid.Row="3" TextTrimming="WordEllipsis" IsVisible="{Binding YearShouldBeVisible}" Text="{x:Static resx:Resources.Year}" Foreground="{DynamicResource SecondaryTextColor}"/>
<TextBlock Margin="20,2,5,2" Grid.Row="4" TextTrimming="WordEllipsis" IsVisible="{Binding GenreShouldBeVisible}" Text="{x:Static resx:Resources.Genre}" Foreground="{DynamicResource SecondaryTextColor}" />
<TextBlock Margin="20,2,5,2" Grid.Row="5" TextTrimming="WordEllipsis" IsVisible="{Binding AlbumShouldBeVisible}" Text="{x:Static resx:Resources.Album}" Foreground="{DynamicResource SecondaryTextColor}" />
<TextBlock Grid.Row="1" Grid.Column="2" Foreground="{DynamicResource PrimaryTextColor}" Text="{Binding Artist}" IsVisible="{Binding ArtistShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="3" Grid.Column="2" Foreground="{DynamicResource PrimaryTextColor}" Text="{Binding Year}" IsVisible="{Binding YearShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="4" Grid.Column="2" Foreground="{DynamicResource PrimaryTextColor}" Text="{Binding Genre}" IsVisible="{Binding GenreShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
<TextBlock Grid.Row="5" Grid.Column="2" Foreground="{DynamicResource PrimaryTextColor}" Text="{Binding Album}" IsVisible="{Binding AlbumShouldBeVisible}" Margin="2,2,10,2" VerticalAlignment="Stretch" TextWrapping="Wrap"/>
</Grid>
<ListBox x:Name="IntegrationItemBox" Grid.Row="2" Grid.ColumnSpan="2" Margin="10" BorderBrush="{x:Null}" FontSize="14" Items="{Binding Entries}" SelectedIndex="{Binding SelectedItem}" Foreground="{StaticResource PrimaryTextColor}"/>
<Grid Grid.Row="3" Grid.ColumnSpan="2" Background="{StaticResource BackgroundColor}" Margin="0,0,0,10">
<ListBox x:Name="IntegrationItemBox" Grid.Row="2" Grid.ColumnSpan="2" Margin="10" BorderBrush="{x:Null}" FontSize="14" Items="{Binding Entries}" SelectedIndex="{Binding SelectedItem}" Foreground="{DynamicResource PrimaryTextColor}"/>
<Grid Grid.Row="3" Grid.ColumnSpan="2" Background="{DynamicResource BackgroundColor}" Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding URL}" Foreground="{StaticResource Blue}" PointerPressed="OnLinkClicked" FontSize="14" VerticalAlignment="Center" Margin="10,0" Cursor="Hand" TextTrimming="CharacterEllipsis"/>
<TextBlock Grid.Column="0" Text="{Binding URL}" Foreground="{DynamicResource Blue}" PointerPressed="OnLinkClicked" FontSize="14" VerticalAlignment="Center" Margin="10,0" Cursor="Hand" TextTrimming="CharacterEllipsis"/>
</Grid>
</Grid>
</Grid>

2
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/TagEditor/TagEditor.axaml
View file

@ -45,7 +45,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<NativeMenuBar Grid.Row="0"/>
<DockPanel Grid.Row="2" Background="{StaticResource ForegroundColor}" LastChildFill="False">
<DockPanel Grid.Row="2" Background="{DynamicResource ForegroundColor}" LastChildFill="False">
<Button DockPanel.Dock="Right" Content="{x:Static resx:Resources.Menu_File_Save}" Margin="10" Command="{Binding SaveCommand}"/>
<Button DockPanel.Dock="Right" Content="{x:Static resx:Resources.Menu_File_Open}" Margin="10" Command="{Binding OpenCommand}"/>
</DockPanel>

12
FRESHMusicPlayer/FRESHMusicPlayer-Avalonia/Views/TrackInfo.axaml
View file

@ -14,7 +14,7 @@
<Panel>
<controls:BlurryImage ZIndex="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Source="{Binding CoverArt}" BlurLevel="10" Stretch="UniformToFill" Margin="-10"/>
<Rectangle ZIndex="1" Fill="{StaticResource BackgroundColor}" Opacity="0.55"/>
<Rectangle ZIndex="1" Fill="{DynamicResource BackgroundColor}" Opacity="0.55"/>
<Grid ZIndex="2" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@ -43,11 +43,11 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Margin="0,2" Text="{x:Static resx:Resources.Bitrate}" Foreground="{StaticResource SecondaryTextColor}"/>
<TextBlock Grid.Column="0" Grid.Row="1" Margin="0,2" Text="{x:Static resx:Resources.Disc}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="2" Margin="0,2" Text="{x:Static resx:Resources.Track}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding TrackNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="3" Margin="0,2" Text="{x:Static resx:Resources.Year}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding YearShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="4" Margin="0,2" Text="{x:Static resx:Resources.Album}" Foreground="{StaticResource SecondaryTextColor}" IsVisible="{Binding AlbumShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="0" Margin="0,2" Text="{x:Static resx:Resources.Bitrate}" Foreground="{DynamicResource SecondaryTextColor}"/>
<TextBlock Grid.Column="0" Grid.Row="1" Margin="0,2" Text="{x:Static resx:Resources.Disc}" Foreground="{DynamicResource SecondaryTextColor}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="2" Margin="0,2" Text="{x:Static resx:Resources.Track}" Foreground="{DynamicResource SecondaryTextColor}" IsVisible="{Binding TrackNumberShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="3" Margin="0,2" Text="{x:Static resx:Resources.Year}" Foreground="{DynamicResource SecondaryTextColor}" IsVisible="{Binding YearShouldBeVisible}"/>
<TextBlock Grid.Column="0" Grid.Row="4" Margin="0,2" Text="{x:Static resx:Resources.Album}" Foreground="{DynamicResource SecondaryTextColor}" IsVisible="{Binding AlbumShouldBeVisible}"/>
<TextBlock Grid.Column="1" Grid.Row="0" Margin="10,2,0,2" Text="{Binding BitrateText}"/>
<TextBlock Grid.Column="1" Grid.Row="1" Margin="10,2,0,2" Text="{Binding DiscNumberText}" IsVisible="{Binding DiscNumberShouldBeVisible}"/>

8
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Properties/AssemblyInfo.cs
View file

@ -5,11 +5,11 @@ using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("FRESHMusicPlayer Blueprint")]
[assembly: AssemblyTitle("FRESHMusicPlayer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Squid Grill")]
[assembly: AssemblyProduct("FRESHMusicPlayer Blueprint")]
[assembly: AssemblyProduct("FRESHMusicPlayer")]
[assembly: AssemblyCopyright("Copyright © Squid Grill 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -49,6 +49,6 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("11.1.5.0")]
[assembly: AssemblyFileVersion("11.1.5.0")]
[assembly: AssemblyVersion("11.1.0.0")]
[assembly: AssemblyFileVersion("11.1.0.0")]
[assembly: AssemblyInformationalVersion("FRESHMusicPlayer Ver. 11.1")]