Merge pull request #15 from Difegue/dev

1.4.1
Difegue · Dec 15, 2020 · 6f5cb32 · 6f5cb32
2 parents 170782c + bfaa073
commit 6f5cb32
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/Sources/FluentMPC/FluentMPC.csproj b/Sources/FluentMPC/FluentMPC.csproj
@@ -129,7 +129,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CodeProject.ObjectPool">
-      <Version>4.0.2</Version>
+      <Version>5.0.1</Version>
     </PackageReference>
     <PackageReference Include="ksemenenko.ColorThief">
       <Version>1.1.1.4</Version>
@@ -138,25 +138,25 @@
       <Version>6.2.9</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp">
-      <Version>6.1.0</Version>
+      <Version>6.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>6.1.0</Version>
+      <Version>6.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
-      <Version>6.1.0</Version>
+      <Version>6.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>6.1.0</Version>
+      <Version>6.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.4.3</Version>
+      <Version>2.5.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Drawing.Common">
-      <Version>4.7.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="WriteableBitmapEx">
       <Version>1.6.7</Version>

diff --git a/Sources/FluentMPC/Package.appxmanifest b/Sources/FluentMPC/Package.appxmanifest
@@ -12,7 +12,7 @@
   <Identity
     Name="13459Difegue.Stylophone"
     Publisher="CN=B2F6FFCA-07C7-479C-AC33-2C75463C7DCE"
-    Version="1.4.0.0" />
+    Version="1.4.1.0" />
 
   <mp:PhoneIdentity PhoneProductId="6aab9ef0-77d1-4922-a9da-497e36a34491" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/Sources/FluentMPC/Properties/Default.rd.xml b/Sources/FluentMPC/Properties/Default.rd.xml
@@ -20,9 +20,8 @@
     <!--
       An Assembly element with Name="*Application*" applies to all assemblies in
       the application package. The asterisks are not wildcards.
-    
+    -->
     <Assembly Name="*Application*" Dynamic="Required All" />
--->
 
     <!-- Add your application specific runtime directives here. -->
 

diff --git a/Sources/FluentMPC/Services/AlbumArtService.cs b/Sources/FluentMPC/Services/AlbumArtService.cs
@@ -177,7 +177,7 @@ private async static Task<WriteableBitmap> GetAlbumBitmap(IMpdFile f, CoreDispat
                             if (!albumReq.IsResponseValid) break;
 
                             var response = albumReq.Response.Content;
-                            if (response.Binary == 0) break; // MPD isn't giving us any more data, let's roll with what we have.
+                            if (response == null || response.Binary == 0) break; // MPD isn't giving us any more data, let's roll with what we have.
 
                             totalBinarySize = response.Size;
                             currentSize += response.Binary;

diff --git a/Sources/FluentMPC/Services/MPDConnectionService.cs b/Sources/FluentMPC/Services/MPDConnectionService.cs
@@ -81,9 +81,9 @@ public static async Task InitializeAsync()
                 _statusConnection = await GetConnectionInternalAsync();
 
                 ConnectionPool = new ObjectPool<PooledObjectWrapper<MpcConnection>>(ConnectionPoolSize,
-                    async (t1, t2) =>
+                    async (token) =>
                     {
-                        var c = await GetConnectionInternalAsync(t1);
+                        var c = await GetConnectionInternalAsync(token);
                         return new PooledObjectWrapper<MpcConnection>(c)
                         {
                             // Check our internal global IsConnected status

diff --git a/Sources/FluentMPC/Views/LibraryPage.xaml b/Sources/FluentMPC/Views/LibraryPage.xaml
@@ -57,9 +57,9 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         BlurRadius="10"
-                        OffsetY="2"
+                        OffsetY="1"
                         ShadowOpacity="0.6"
-                        Color="{ThemeResource SystemBaseLowColor}">
+                        Color="{ThemeResource SystemBaseHighColor}">
 
                             <Grid Width="180" Height="180" CornerRadius="3" >
                                 <controls:ImageEx Style="{StaticResource NoAnimationImageEx}"