v2.3.1

davidxuang · Feb 24, 2024 · fb4fe1e · fb4fe1e
1 parent a708492
commit fb4fe1e
Show file tree

Hide file tree

Showing 17 changed files with 540 additions and 203 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -0,0 +1,11 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <Version>2.3.1</Version>
+    <Authors>davidxuang</Authors>
+    <RepositoryUrl>https://github.com/davidxuang/MusicDecrypto</RepositoryUrl>
+  </PropertyGroup>
+
+</Project>
diff --git a/MusicDecrypto.Avalonia/App.axaml b/MusicDecrypto.Avalonia/App.axaml
@@ -1,12 +1,12 @@
 <Application x:Class="MusicDecrypto.Avalonia.App"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:ic="using:FluentIcons.Avalonia.Fluent"
              xmlns:sty="using:FluentAvalonia.Styling">
 
     <Application.Resources>
         <ResourceDictionary>
-            <ic:SymbolIconSource x:Key="BoxMultipleIcon" Symbol="BoxMultiple" />
+            <ic:SymbolIconSource x:Key="BoxIcon" Symbol="Box" />
             <ic:SymbolIconSource x:Key="CodeIcon" Symbol="Code" />
             <ic:SymbolIconSource x:Key="DocumentBulletListIcon" Symbol="DocumentBulletList" />
             <ic:SymbolIconSource x:Key="OpenIcon" Symbol="Open" />

diff --git a/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml b/MusicDecrypto.Avalonia/Controls/UrlTextBlock.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ic="using:FluentIcons.FluentAvalonia"
+        xmlns:ic="using:FluentIcons.Avalonia.Fluent"
         xmlns:local="using:MusicDecrypto.Avalonia.Controls">
 
     <Design.PreviewWith>
@@ -14,9 +14,14 @@
         <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorPrimaryBrush}" />
         <Setter Property="Template">
             <ControlTemplate>
-                <StackPanel Name="LayoutRoot" Orientation="Horizontal" Spacing="2">
-                    <TextBlock Theme="{StaticResource FluentBodyStrongTextBlockStyle}" Text="{TemplateBinding Text}" />
-                    <ic:SymbolIcon VerticalAlignment="Center" FontSize="14" Symbol="Open" />
+                <StackPanel Name="LayoutRoot"
+                            Orientation="Horizontal" Spacing="2">
+                    <TextBlock Name="UrlText"
+                               Theme="{StaticResource FluentBodyStrongTextBlockStyle}"
+                               Text="{TemplateBinding Text}" />
+                    <ic:SymbolIcon VerticalAlignment="Center"
+                                   FontSize="{Binding FontSize, ElementName=UrlText}"
+                                   Symbol="Open" />
                 </StackPanel>
             </ControlTemplate>
         </Setter>

diff --git a/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj b/MusicDecrypto.Avalonia/MusicDecrypto.Avalonia.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>musicdecrypto-avalonia</AssemblyName>
     <OutputType>WinExe</OutputType>
-    <VersionPrefix>2.3.0</VersionPrefix>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 
@@ -19,7 +16,7 @@
     <PackageReference Include="Avalonia.Diagnostics" Version="11.0.*" Condition=" '$(Configuration)' == 'Debug' " />
     <PackageReference Include="ByteSize" Version="2.1.*" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.0.*" />
-    <PackageReference Include="FluentIcons.FluentAvalonia" Version="1.1.*" />
+    <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs b/MusicDecrypto.Avalonia/Pages/HomePage.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace MusicDecrypto.Avalonia.Pages;
 

diff --git a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="MusicDecrypto.Avalonia.Pages.SettingsPage"
+<UserControl x:Class="MusicDecrypto.Avalonia.Pages.SettingsPage"
              xmlns="https://github.com/avaloniaui"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:ctrl="using:MusicDecrypto.Avalonia.Controls"
-             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:ic="using:FluentIcons.Avalonia.Fluent"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:vm="using:MusicDecrypto.Avalonia.ViewModels"
              d:DesignWidth="800" d:DesignHeight="450"
@@ -100,7 +100,7 @@
                        Text="About" />
 
             <ui:SettingsExpander Description="Third party open-source projects." Header="Credits"
-                                 IconSource="{StaticResource BoxMultipleIcon}">
+                                 IconSource="{StaticResource BoxIcon}">
                 <ui:SettingsExpanderItem>
                     <ItemsControl ItemsSource="{Binding Credits}">
                         <ItemsControl.Styles>

diff --git a/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs b/MusicDecrypto.Avalonia/Pages/SettingsPage.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using MusicDecrypto.Avalonia.Helpers;
 using MusicDecrypto.Avalonia.ViewModels;
 

diff --git a/MusicDecrypto.Avalonia/Program.cs b/MusicDecrypto.Avalonia/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using Avalonia;
+using FluentIcons.Avalonia.Fluent;
 
 namespace MusicDecrypto.Avalonia;
 
@@ -12,5 +13,6 @@ public static void Main(string[] args) => BuildAvaloniaApp()
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
+            .UseSegoeMetrics()
             .LogToTrace();
 }
diff --git a/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs b/MusicDecrypto.Avalonia/ViewModels/MainViewModel.cs
@@ -33,6 +33,8 @@ public partial class MainViewModel : ViewModelBase
 
     public bool IsEmpty => Items.Count == 0;
 
+    public MainViewModel() : this(1) { }
+
     public MainViewModel(double scaling)
     {
         _imageSize = (int)MathHelper.RoundToEven(_imageWidth * 2 * scaling);

diff --git a/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs b/MusicDecrypto.Avalonia/ViewModels/SettingsViewModel.cs
@@ -39,21 +39,22 @@ private static bool TryGetThemeVariant(string? value, [NotNullWhen(true)] out Th
     {
         theme = value switch
         {
-            FluentAvaloniaTheme.LightModeString => ThemeVariant.Light,
-            FluentAvaloniaTheme.DarkModeString  => ThemeVariant.Dark,
-            _                                   => null,
+            FluentAvaloniaTheme.LightModeString        => ThemeVariant.Light,
+            FluentAvaloniaTheme.DarkModeString         => ThemeVariant.Dark,
+            FluentAvaloniaTheme.HighContrastModeString => FluentAvaloniaTheme.HighContrastTheme,
+                _                                      => null,
         };
         return theme is not null;
     }
 
     private static readonly string _systemModeString = "System";
-    public static string[] AppThemes => new[]
-    {
+    public static string[] AppThemes =>
+    [
         _systemModeString,
         FluentAvaloniaTheme.LightModeString,
         FluentAvaloniaTheme.DarkModeString,
-        // FluentAvaloniaTheme.HighContrastModeString
-    };
+        FluentAvaloniaTheme.HighContrastModeString
+    ];
 
     public static string Version => typeof(Program).Assembly.GetName().Version!.ToString();
 
@@ -70,6 +71,7 @@ public record class CreditItem(
         new CreditItem("AvaloniaUI", "MIT", "https://avaloniaui.net/"),
         new CreditItem("FluentAvalonia", "MIT", "https://github.com/amwx/FluentAvalonia"),
         new CreditItem("fluentui-system-icons", "MIT", "https://github.com/microsoft/fluentui-system-icons"),
+        new CreditItem("FluentIcons", "MIT", "https://github.com/davidxuang/FluentIcons"),
         new CreditItem("NativeMemoryArray", "MIT", "https://github.com/Cysharp/NativeMemoryArray"),
         new CreditItem("TagLibSharp", "LGPL-2.1", "https://github.com/mono/taglib-sharp"),
         new CreditItem("ByteSize", "MIT", "https://github.com/omar/ByteSize"),

diff --git a/MusicDecrypto.Avalonia/Views/MainView.axaml b/MusicDecrypto.Avalonia/Views/MainView.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:ic="using:FluentIcons.FluentAvalonia"
+             xmlns:ic="using:FluentIcons.Avalonia.Fluent"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              d:DesignWidth="800" d:DesignHeight="450"
              mc:Ignorable="d">
@@ -15,7 +15,6 @@
             <Grid.Styles>
                 <Style Selector="Button.AppBarButton">
                     <Setter Property="Padding" Value="8" />
-                    <Setter Property="FontSize" Value="20" />
                     <Setter Property="BorderThickness" Value="0" />
                     <Setter Property="Theme" Value="{StaticResource TransparentButton}" />
                 </Style>
@@ -31,7 +30,7 @@
                     IsEnabled="{Binding #FrameView.CanGoBack}"
                     IsVisible="{Binding #FrameView.CanGoBack}">
                 <Button.Content>
-                    <ic:SymbolIcon FontSize="20" Symbol="ArrowLeft" />
+                    <ic:SymbolIcon Symbol="ArrowLeft" />
                 </Button.Content>
                 <ToolTip.Tip>Back</ToolTip.Tip>
             </Button>

diff --git a/MusicDecrypto.Commandline/MusicDecrypto.Commandline.csproj b/MusicDecrypto.Commandline/MusicDecrypto.Commandline.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>musicdecrypto</AssemblyName>
     <OutputType>Exe</OutputType>
-    <Version>2.3.0</Version>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git a/MusicDecrypto.Library.Tests/MusicDecrypto.Library.Tests.csproj b/MusicDecrypto.Library.Tests/MusicDecrypto.Library.Tests.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>