From 9aedb74437aff8cbe4dbdcf1ba3f7bd5e6f90aa1 Mon Sep 17 00:00:00 2001
From: Wang Fu <wangfu91@hotmail.com>
Date: Sun, 6 Aug 2017 00:45:29 +0800
Subject: [PATCH 1/3] Adjust logger level.

---
 BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs b/BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs
index 5a2b4a5..8f1e55a 100644
--- a/BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs
+++ b/BreadPlayer.Views.UWP/ViewModels/ShellViewModel.cs
@@ -857,7 +857,7 @@ private async void OnDefaultAudioRenderDeviceChanged(object sender, DefaultAudio
 
             var oldDevice = await DeviceInformation.CreateFromIdAsync(_audioDeviceId);
             var device = await DeviceInformation.CreateFromIdAsync(args.Id);
-            BLogger.Logger.Error($"Switching audio render device from [{oldDevice.Name}] to [{device.Name}]");
+            BLogger.Logger.Info($"Switching audio render device from [{oldDevice.Name}] to [{device.Name}]");
 
             _audioDeviceId = args.Id;
 

From 5cfff2e3ec79524a8bc704a84704ef787f5ce595 Mon Sep 17 00:00:00 2001
From: Wang Fu <wangfu91@hotmail.com>
Date: Tue, 8 Aug 2017 13:13:39 +0800
Subject: [PATCH 2/3] Update NuGet packages.

---
 BreadPlayer.Core/project.json                      |  2 +-
 BreadPlayer.Database/BreadPlayer.Database.csproj   |  4 ++--
 BreadPlayer.Framework/BreadPlayer.Framework.csproj | 10 +++++-----
 BreadPlayer.Framework/packages.config              |  2 +-
 BreadPlayer.Views.UWP/project.json                 |  6 +++---
 BreadPlayer.Web.Tests/project.json                 |  8 ++++----
 BreadPlayer.Web/project.json                       |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/BreadPlayer.Core/project.json b/BreadPlayer.Core/project.json
index 64b2e2b..b871c0e 100644
--- a/BreadPlayer.Core/project.json
+++ b/BreadPlayer.Core/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
     "NETStandard.Library": "1.6.1",
-    "Newtonsoft.Json": "10.0.2",
+    "Newtonsoft.Json": "10.0.3",
     "System.ValueTuple": "4.3.1"
   },
   "frameworks": {
diff --git a/BreadPlayer.Database/BreadPlayer.Database.csproj b/BreadPlayer.Database/BreadPlayer.Database.csproj
index 61d2be1..b05845f 100644
--- a/BreadPlayer.Database/BreadPlayer.Database.csproj
+++ b/BreadPlayer.Database/BreadPlayer.Database.csproj
@@ -15,8 +15,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" />
 
   <ItemGroup>
-    <PackageReference Include="LiteDB" Version="3.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="LiteDB" Version="3.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BreadPlayer.Core\BreadPlayer.Core.csproj" />
diff --git a/BreadPlayer.Framework/BreadPlayer.Framework.csproj b/BreadPlayer.Framework/BreadPlayer.Framework.csproj
index bef9a0a..d79cdfa 100644
--- a/BreadPlayer.Framework/BreadPlayer.Framework.csproj
+++ b/BreadPlayer.Framework/BreadPlayer.Framework.csproj
@@ -140,25 +140,25 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.2.3.4.247\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BreadPlayer.Framework/packages.config b/BreadPlayer.Framework/packages.config
index 33c4845..e18960f 100644
--- a/BreadPlayer.Framework/packages.config
+++ b/BreadPlayer.Framework/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.4.247" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/BreadPlayer.Views.UWP/project.json b/BreadPlayer.Views.UWP/project.json
index fcb22f9..b8e36c4 100644
--- a/BreadPlayer.Views.UWP/project.json
+++ b/BreadPlayer.Views.UWP/project.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "ksemenenko.ColorThief": "1.1.0.3",
-    "ManagedBass": "2.0.0",
+    "ManagedBass": "2.0.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
-    "Microsoft.Toolkit.Uwp.Notifications": "1.4.1",
+    "Microsoft.Toolkit.Uwp.Notifications": "1.5.1",
     "Microsoft.Xaml.Behaviors.Uwp.Managed": "2.0.0",
     "PCLStorage": "1.0.2",
     "System.ValueTuple": "4.3.1",
     "TagLib.Portable": "1.0.4",
-    "Win2D.uwp": "1.20.0"
+    "Win2D.uwp": "1.21.0"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/BreadPlayer.Web.Tests/project.json b/BreadPlayer.Web.Tests/project.json
index 5c177a7..df96191 100644
--- a/BreadPlayer.Web.Tests/project.json
+++ b/BreadPlayer.Web.Tests/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.2",
-    "Newtonsoft.Json": "10.0.2",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
+    "Newtonsoft.Json": "10.0.3",
     "PCLStorage": "1.0.2",
-    "xunit": "2.1.0",
-    "xunit.runner.visualstudio": "2.1.0"
+    "xunit": "2.2.0",
+    "xunit.runner.visualstudio": "2.2.0"
   },
   "frameworks": {
     "uap10.0": {}
diff --git a/BreadPlayer.Web/project.json b/BreadPlayer.Web/project.json
index 43c7eaa..c0bb7e3 100644
--- a/BreadPlayer.Web/project.json
+++ b/BreadPlayer.Web/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "AngleSharp": "0.9.9",
     "Inflatable.Lastfm": "1.0.1.307",
-    "LiteDB": "3.1.0",
+    "LiteDB": "3.1.2",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
     "NETStandard.Library": "1.6.1"
   },

From b4c1fcca67f00f5d03fe93b9914c363ae285c8b2 Mon Sep 17 00:00:00 2001
From: Frank Wang <wangfu91@hotmail.com>
Date: Thu, 14 Sep 2017 23:30:41 +0800
Subject: [PATCH 3/3] Simple compact overlay mode for PC.

---
 .../BreadPlayer.Views.UWP.csproj              | 37 +++++++++++++++++--
 .../Views/NowPlayingView.xaml.cs              | 19 +++++++++-
 BreadPlayer.Views.UWP/project.json            | 24 ------------
 3 files changed, 51 insertions(+), 29 deletions(-)
 delete mode 100644 BreadPlayer.Views.UWP/project.json

diff --git a/BreadPlayer.Views.UWP/BreadPlayer.Views.UWP.csproj b/BreadPlayer.Views.UWP/BreadPlayer.Views.UWP.csproj
index a579649..45ba5f4 100644
--- a/BreadPlayer.Views.UWP/BreadPlayer.Views.UWP.csproj
+++ b/BreadPlayer.Views.UWP/BreadPlayer.Views.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>BreadPlayer</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -20,6 +20,7 @@
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
@@ -170,7 +171,6 @@
     <None Include="BreadPlayer.Views.UWP_TemporaryKey.pfx" />
     <None Include="BreadPlayer_StoreKey.pfx" />
     <None Include="Macalifa.licenseheader" />
-    <None Include="project.json" />
     <PRIResource Include="Strings\es-es\Resources.resw">
       <SubType>Designer</SubType>
     </PRIResource>
@@ -540,10 +540,10 @@
     <SDKReference Include="Microsoft.VCLibs, Version=14.0">
       <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
     </SDKReference>
-    <SDKReference Include="WindowsDesktop, Version=10.0.14393.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.15063.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
-    <SDKReference Include="WindowsMobile, Version=10.0.14393.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.15063.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
@@ -582,6 +582,35 @@
       <Name>BreadPlayer.Web</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ksemenenko.ColorThief">
+      <Version>1.1.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="ManagedBass">
+      <Version>2.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>5.3.3</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
+      <Version>1.5.1</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
+      <Version>2.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="PCLStorage">
+      <Version>1.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="TagLib.Portable">
+      <Version>1.0.4</Version>
+    </PackageReference>
+    <PackageReference Include="Win2D.uwp">
+      <Version>1.21.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/BreadPlayer.Views.UWP/Views/NowPlayingView.xaml.cs b/BreadPlayer.Views.UWP/Views/NowPlayingView.xaml.cs
index 72899d2..59e11f2 100644
--- a/BreadPlayer.Views.UWP/Views/NowPlayingView.xaml.cs
+++ b/BreadPlayer.Views.UWP/Views/NowPlayingView.xaml.cs
@@ -56,11 +56,28 @@ private async void NowPlayingView_LyricActivated(object sender, EventArgs e)
             catch { }
         }
         bool isMaximized = false;
-        private void OnMaximizeToFullScreen(object sender, RoutedEventArgs e)
+
+        private async void OnMaximizeToFullScreen(object sender, RoutedEventArgs e)
         {
             VisualStateManager.GoToState(this, isMaximized ? "MinimizeState" : "MaximizeState", false);
+
+            if (ApplicationView.GetForCurrentView().IsViewModeSupported(ApplicationViewMode.CompactOverlay))
+            {
+                if (!isMaximized)
+                {
+                    var preferences = ViewModePreferences.CreateDefault(ApplicationViewMode.CompactOverlay);
+                    preferences.CustomSize = new Windows.Foundation.Size(335, 455);
+                    await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay, preferences);
+                }
+                else
+                {
+                    await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.Default);
+                }
+            }
+
             isMaximized = !isMaximized;
         }
+
         private void OnShareSong(object sender, RoutedEventArgs e)
         {
             DataTransferManager.ShowShareUI();
diff --git a/BreadPlayer.Views.UWP/project.json b/BreadPlayer.Views.UWP/project.json
deleted file mode 100644
index 0cd4243..0000000
--- a/BreadPlayer.Views.UWP/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dependencies": {
-    "ksemenenko.ColorThief": "1.1.0.3",
-    "ManagedBass": "2.0.1",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
-    "Microsoft.Toolkit.Uwp.Notifications": "1.5.1",
-    "Microsoft.Xaml.Behaviors.Uwp.Managed": "2.0.0",
-    "PCLStorage": "1.0.2",
-    "System.ValueTuple": "4.4.0",
-    "TagLib.Portable": "1.0.4",
-    "Win2D.uwp": "1.21.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file