Merge pull request #272 from Founntain/icon-fixes

Update Avalonia packages and remove redundant resources
Founntain · Apr 19, 2024 · 78d5b15 · 78d5b15
2 parents 6ef30cf + a3fcf12
commit 78d5b15
Show file tree

Hide file tree

Showing 27 changed files with 100 additions and 108 deletions.
diff --git a/OsuPlayer.CrashHandler/OsuPlayer.CrashHandler.csproj b/OsuPlayer.CrashHandler/OsuPlayer.CrashHandler.csproj
@@ -26,13 +26,13 @@
         <TrimmableAssembly Include="Avalonia.Themes.Default" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.9" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
-        <PackageReference Include="ReactiveUI" Version="19.5.41" />
+        <PackageReference Include="ReactiveUI" Version="19.6.1" />
     </ItemGroup>
     <ItemGroup>
         <Compile Update="CrashHandlerMainWindowViewModel.cs">

diff --git a/OsuPlayer.Data/OsuPlayer.Data.csproj b/OsuPlayer.Data/OsuPlayer.Data.csproj
@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
         <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="ManagedBass" Version="3.1.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/OsuPlayer.Extensions/OsuPlayer.Extensions.csproj b/OsuPlayer.Extensions/OsuPlayer.Extensions.csproj
@@ -8,10 +8,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
-        <PackageReference Include="DynamicData" Version="8.3.27" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
+        <PackageReference Include="DynamicData" Version="8.4.1" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.9" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
         <PackageReference Include="Splat" Version="14.8.12" />
     </ItemGroup>
 

diff --git a/OsuPlayer.Extensions/ValueConverters/IconNameToIconKindConverter.cs b/OsuPlayer.Extensions/ValueConverters/IconNameToIconKindConverter.cs
@@ -0,0 +1,27 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+using Material.Icons;
+
+namespace OsuPlayer.Extensions.ValueConverters;
+
+public class IconNameToIconKindConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not string s) return MaterialIconKind.Error;
+
+        try
+        {
+            return Enum.Parse<MaterialIconKind>(s);
+        }
+        catch (Exception ex)
+        {
+            return MaterialIconKind.Error;
+        }
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/OsuPlayer.IO/OsuPlayer.IO.csproj b/OsuPlayer.IO/OsuPlayer.IO.csproj
@@ -13,10 +13,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
-        <PackageReference Include="DynamicData" Version="8.3.27" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
+        <PackageReference Include="DynamicData" Version="8.4.1" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
-        <PackageReference Include="MongoDB.Bson" Version="2.22.0" />
+        <PackageReference Include="MongoDB.Bson" Version="2.25.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Realm" Version="11.6.1" >
             <IncludeAssets>native</IncludeAssets>

diff --git a/OsuPlayer.Interfaces/OsuPlayer.Interfaces.csproj b/OsuPlayer.Interfaces/OsuPlayer.Interfaces.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
         <PackageReference Include="LiveChartsCore" Version="2.0.0-rc2" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/OsuPlayer.Network/OsuPlayer.Network.csproj b/OsuPlayer.Network/OsuPlayer.Network.csproj
@@ -7,11 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Octokit" Version="10.0.0" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="Octokit" Version="11.0.1" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/OsuPlayer.Services/OsuPlayer.Services.csproj b/OsuPlayer.Services/OsuPlayer.Services.csproj
@@ -10,7 +10,7 @@
         <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
         <PackageReference Include="LiveChartsCore" Version="2.0.0-rc2" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/OsuPlayer.Tests/OsuPlayer.Tests.csproj b/OsuPlayer.Tests/OsuPlayer.Tests.csproj
@@ -13,11 +13,11 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="coverlet.collector" Version="6.0.1">
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/OsuPlayer/App.axaml b/OsuPlayer/App.axaml
@@ -5,6 +5,8 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
              xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             xmlns:valueConverters="clr-namespace:OsuPlayer.Extensions.ValueConverters;assembly=OsuPlayer.Extensions"
+             xmlns:internalValueConverters="clr-namespace:OsuPlayer.ValueConverters"
              x:Class="OsuPlayer.App"
              RequestedThemeVariant="Dark">
     <Application.DataTemplates>
@@ -36,12 +38,38 @@
             <SolidColorBrush x:Key="ProgressbarColorBrush" Color="{DynamicResource ProgressbarColor}" />
             <SolidColorBrush x:Key="ButtonBackground" Color="#4C000000" />
 
+            <Color x:Key="PopupBase">#FF2B2B2B</Color>
+
             <Color x:Key="AppBackgroundColor">Black</Color>
         </ResourceDictionary>
+
+        <!-- Value Converters -->
+        <internalValueConverters:PlaylistValueConverter x:Key="PlaylistValueConverter" />
+
+        <valueConverters:UsernameConverter x:Key="UsernameConverter" />
+        <valueConverters:IconNameToIconKindConverter x:Key="IconNameToIconKindConverter" />
+        <valueConverters:PlayPauseConverter x:Key="PlayPauseConverter" />
+        <valueConverters:ShuffleConverter x:Key="ShuffleConverter" />
+        <valueConverters:RepeatConverter x:Key="RepeatConverter" />
+        <valueConverters:VolumeConverter x:Key="VolumeConverter" />
+        <valueConverters:IsCurrentSongInPlaylistConverter x:Key="IsCurrentSongInPlaylistConverter" />
+        <valueConverters:IsCurrentSongOnBlacklistConverter x:Key="IsCurrentSongOnBlacklistConverter" />
+        <valueConverters:SourceListValueConverter x:Key="SourceListValueConverter" />
+        <valueConverters:GridFormatter x:Key="GridFormatter" />
+        <valueConverters:LastFmToAuthConverter x:Key="LastFmToAuthConverter" />
+        <valueConverters:DecimalFormatter x:Key="DecimalFormatter" />
+        <valueConverters:OsuProfileConverter x:Key="OsuProfileConverter" />
+        <valueConverters:BeatmapModelFullSongNameConverter x:Key="FullSongNameConverter" />
+        <valueConverters:BeatmapModelLastPlayedConverter x:Key="LastPlayedConverter" />
+        <valueConverters:BeatmapModelMostPlayedConverter x:Key="MostPlayedConverter" />
+        <valueConverters:BeatmapModelTimesPlayedConverter x:Key="TimesPlayedConverter" />
     </Application.Resources>
 
     <Application.Styles>
+
+        <!-- Framework and Addons Styles -->
         <sty:FluentAvaloniaTheme PreferUserAccentColor="True" />
+
         <materialIcons:MaterialIconStyles />
         <!-- <FluentTheme /> -->
     </Application.Styles>

diff --git a/OsuPlayer/OsuPlayer.csproj b/OsuPlayer/OsuPlayer.csproj
@@ -29,13 +29,13 @@
         <TrimmableAssembly Include="Avalonia.Themes.Default" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.9" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.9" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.9" />
-        <PackageReference Include="Avalonia.Skia" Version="11.0.9" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
-        <PackageReference Include="DynamicData" Version="8.3.27" />
+        <PackageReference Include="Avalonia" Version="11.0.10" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+        <PackageReference Include="Avalonia.Skia" Version="11.0.10" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+        <PackageReference Include="DynamicData" Version="8.4.1" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
         <PackageReference Include="Founntain.Nein" Version="2023.1115.0" />
         <PackageReference Include="Founntain.OsuPlayer.NativeLibs" Version="1.0.6" />
@@ -46,12 +46,12 @@
         <PackageReference Include="ManagedBass.Enc" Version="3.1.1" />
         <PackageReference Include="ManagedBass.Fx" Version="3.1.1" />
         <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
-        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.0" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="2.1.9" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.11" />
-        <PackageReference Include="SkiaSharp.Views" Version="2.88.7" />
+        <PackageReference Include="OsuPlayer.Api.Data" Version="1.0.12" />
+        <PackageReference Include="SkiaSharp.Views" Version="2.88.8" />
         <PackageReference Include="TagLibSharp" Version="2.3.0" />
-        <PackageReference Include="SkiaSharp" Version="2.88.7" />
+        <PackageReference Include="SkiaSharp" Version="2.88.8" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Resources" />

diff --git a/OsuPlayer/Views/BeatmapsView.axaml b/OsuPlayer/Views/BeatmapsView.axaml
@@ -5,15 +5,8 @@
              xmlns:views="clr-namespace:OsuPlayer.Views"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:entityModels="clr-namespace:OsuPlayer.Api.Data.API.EntityModels;assembly=OsuPlayer.Api.Data"
-             xmlns:valueConverters="clr-namespace:OsuPlayer.Extensions.ValueConverters;assembly=OsuPlayer.Extensions"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="OsuPlayer.Views.BeatmapsView">
-    <UserControl.Resources>
-        <valueConverters:BeatmapModelFullSongNameConverter x:Key="FullSongNameConverter" />
-        <valueConverters:BeatmapModelLastPlayedConverter x:Key="LastPlayedConverter" />
-        <valueConverters:BeatmapModelMostPlayedConverter x:Key="MostPlayedConverter" />
-        <valueConverters:BeatmapModelTimesPlayedConverter x:Key="TimesPlayedConverter" />
-    </UserControl.Resources>
     <Design.DataContext>
         <views:BeatmapsViewModel />
     </Design.DataContext>

diff --git a/OsuPlayer/Views/BlacklistEditorView.axaml b/OsuPlayer/Views/BlacklistEditorView.axaml
@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:valueConverters="clr-namespace:OsuPlayer.ValueConverters"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:views="clr-namespace:OsuPlayer.Views"
              xmlns:interfaces="clr-namespace:OsuPlayer.Data.DataModels.Interfaces;assembly=OsuPlayer.Data"
@@ -12,10 +11,7 @@
     <Design.DataContext>
         <views:BlacklistEditorViewModel />
     </Design.DataContext>
-
-    <UserControl.Resources>
-        <valueConverters:PlaylistValueConverter x:Key="PlaylistValueConverter" />
-    </UserControl.Resources>
+
     <Grid Row="1" ColumnDefinitions="*, 50, *" Margin="0 1">
         <Grid Column="1">
             <StackPanel Spacing="10" VerticalAlignment="Center" HorizontalAlignment="Center">

diff --git a/OsuPlayer/Views/EqualizerView.axaml b/OsuPlayer/Views/EqualizerView.axaml
@@ -8,9 +8,6 @@
              x:Class="OsuPlayer.Views.EqualizerView"
              FontWeight="{DynamicResource DefaultFontWeight}"
              FontSize="16">
-    <UserControl.Resources>
-        <Color x:Key="PopupBase">#FF2B2B2B</Color>
-    </UserControl.Resources>
 
     <Design.DataContext>
         <vm:EqualizerViewModel />

diff --git a/OsuPlayer/Views/HomeSubViews/HomeUserPanelView.axaml b/OsuPlayer/Views/HomeSubViews/HomeUserPanelView.axaml
@@ -3,9 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:valueConverters="clr-namespace:OsuPlayer.Extensions.ValueConverters;assembly=OsuPlayer.Extensions"
              xmlns:homeSubViews="clr-namespace:OsuPlayer.Views.HomeSubViews"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
              xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:entityModels="clr-namespace:OsuPlayer.Api.Data.API.EntityModels;assembly=OsuPlayer.Api.Data"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -15,10 +13,6 @@
         <homeSubViews:HomeUserPanelViewModel />
     </Design.DataContext>
 
-    <UserControl.Resources>
-        <valueConverters:UsernameConverter x:Key="UsernameConverter" />
-    </UserControl.Resources>
-
     <Grid ColumnDefinitions="50*, 50*">
         <!-- Not Login Grid -->
         <ui:InfoBar Grid.Column="0" Grid.ColumnSpan="2" Severity="Warning" Title="Not logged in"
@@ -62,7 +56,7 @@
                         </ItemsRepeater.Layout>
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate DataType="entityModels:BadgeModel">
-                                <avalonia:MaterialIcon Kind="{Binding Icon}" Width="24" Height="24" ToolTip.Tip="{Binding Description}" />
+                                <avalonia:MaterialIcon Kind="{Binding IconName, Converter={StaticResource IconNameToIconKindConverter}}" Width="24" Height="24" ToolTip.Tip="{Binding Description}" />
                             </DataTemplate>
                         </ItemsRepeater.ItemTemplate>
                     </ItemsRepeater>

diff --git a/OsuPlayer/Views/PartyView.axaml b/OsuPlayer/Views/PartyView.axaml
@@ -5,6 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="OsuPlayer.Views.PartyView"
              FontWeight="{DynamicResource DefaultFontWeight}">
+
     <StackPanel Spacing="5" VerticalAlignment="Center" HorizontalAlignment="Center">
         <TextBlock Text="sorry, but this is still work in progress" VerticalAlignment="Center"
                    HorizontalAlignment="Center" />

diff --git a/OsuPlayer/Views/PartyView.axaml.cs b/OsuPlayer/Views/PartyView.axaml.cs
@@ -1,5 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Material.Icons;
+using Material.Icons.Avalonia;
 using Nein.Extensions;
 
 namespace OsuPlayer.Views;

diff --git a/OsuPlayer/Views/PlayHistoryView.axaml b/OsuPlayer/Views/PlayHistoryView.axaml
@@ -10,6 +10,7 @@
     <Design.DataContext>
         <views:PlayHistoryViewModel />
     </Design.DataContext>
+
     <Grid RowDefinitions="50, *">
         <Border Grid.Row="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{DynamicResource BaseBrightDarkTransparentColor}">
             <TextBlock Text="Play history" Margin="10 0" FontSize="26"

diff --git a/OsuPlayer/Views/PlayerControlView.axaml b/OsuPlayer/Views/PlayerControlView.axaml
@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:cv="using:OsuPlayer.Extensions.ValueConverters"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:views="clr-namespace:OsuPlayer.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -13,15 +12,6 @@
         <StyleInclude Source="/Styles/FlyoutStyle.axaml" />
     </UserControl.Styles>
 
-    <UserControl.Resources>
-        <cv:PlayPauseConverter x:Key="PlayPauseConverter" />
-        <cv:ShuffleConverter x:Key="ShuffleConverter" />
-        <cv:RepeatConverter x:Key="RepeatConverter" />
-        <cv:VolumeConverter x:Key="VolumeConverter" />
-        <cv:IsCurrentSongInPlaylistConverter x:Key="IsCurrentSongInPlaylistConverter" />
-        <cv:IsCurrentSongOnBlacklistConverter x:Key="IsCurrentSongOnBlacklistConverter" />
-    </UserControl.Resources>
-
     <Design.DataContext>
         <views:PlayerControlViewModel />
     </Design.DataContext>

diff --git a/OsuPlayer/Views/PlaylistEditorView.axaml b/OsuPlayer/Views/PlaylistEditorView.axaml
@@ -3,19 +3,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:valueConverters="clr-namespace:OsuPlayer.ValueConverters"
-             xmlns:extensions="clr-namespace:OsuPlayer.Extensions.ValueConverters;assembly=OsuPlayer.Extensions"
              xmlns:views="clr-namespace:OsuPlayer.Views"
              xmlns:interfaces="clr-namespace:OsuPlayer.Data.DataModels.Interfaces;assembly=OsuPlayer.Data"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="OsuPlayer.Views.PlaylistEditorView"
              FontWeight="{DynamicResource DefaultFontWeight}">
-    <UserControl.Resources>
-        <valueConverters:PlaylistValueConverter x:Key="PlaylistValueConverter" />
-        <extensions:SourceListValueConverter x:Key="SourceListValueConverter" />
-
-        <Color x:Key="PopupBase">#FF2B2B2B</Color>
-    </UserControl.Resources>
 
     <Design.DataContext>
         <views:PlaylistEditorViewModel />

diff --git a/OsuPlayer/Views/PlaylistView.axaml b/OsuPlayer/Views/PlaylistView.axaml
@@ -14,8 +14,6 @@
         <views:PlaylistViewModel />
     </Design.DataContext>
 
-    <UserControl.Resources>
-    </UserControl.Resources>
     <Grid ColumnDefinitions="15*, 1, 85*">
         <Grid Column="0" Margin="0 1" RowDefinitions="50, *, 40, 40" Background="{DynamicResource BaseBrighterDarkTransparentColor}">
             <Border Grid.Row="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{DynamicResource BaseBrightDarkTransparentColor}">

diff --git a/OsuPlayer/Views/SearchView.axaml b/OsuPlayer/Views/SearchView.axaml
@@ -7,6 +7,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="OsuPlayer.Views.SearchView"
              FontWeight="{DynamicResource DefaultFontWeight}">
+
     <Design.DataContext>
         <views:SearchViewModel />
     </Design.DataContext>