Add working browser connection

BatuhanAkar · Jul 19, 2018 · c76564e · c76564e
1 parent cffa78d
commit c76564e
Show file tree

Hide file tree

Showing 23 changed files with 482 additions and 229 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -78,3 +78,6 @@ csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
+
+# Braces after if 
+csharp_prefer_braces = false
diff --git a/.gitignore b/.gitignore
@@ -256,4 +256,7 @@ artifacts/
 *.binlog
 
 #linting
-.sonarqube/
+.sonarqube/
+
+# dotnet tools
+.store/
diff --git a/Directory.build.props b/Directory.build.props
@@ -4,11 +4,12 @@
     <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/martijn00/XamarinMediaManager</PackageProjectUrl>
     <PackageIconUrl>https://github.com/martijn00/XamarinMediaManager/blob/master/icon_MediaManager.png</PackageIconUrl>
-    <Owners>Martijn van Dijk</Owners>
     <Authors>Martijn van Dijk</Authors>
+	<Owners>Martijn van Dijk</Owners>
     <PackageTags>xamarin, android, plugin, MediaManager, media, audio, video</PackageTags>
     <PackageReleaseNotes>https://github.com/martijn00/XamarinMediaManager</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/martijn00/XamarinMediaManager</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
@@ -22,16 +23,31 @@
 
     <Platform>AnyCPU</Platform>
     <DebugType>full</DebugType>
-    <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
     <IsLibraryProject>$(MSBuildProjectName.Contains('MediaManager'))</IsLibraryProject>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.5.4" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" /> 
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
   </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <!--<TargetsToBuild>All</TargetsToBuild>-->
+    <TargetsToBuild>Android</TargetsToBuild>
+    <!--<TargetsToBuild>Uap</TargetsToBuild>--> 
+    <!--<TargetsToBuild>iOS</TargetsToBuild>--> 
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
+    <TargetsToBuild>All</TargetsToBuild>
+  </PropertyGroup>
+
 </Project>
diff --git a/Directory.build.targets b/Directory.build.targets
@@ -34,8 +34,4 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
     <DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
   </PropertyGroup>
-
-  <ItemGroup Condition="$(TargetFramework.StartsWith('uap'))">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
-  </ItemGroup>
 </Project>
diff --git a/MediaManager.Forms/MediaManager.Forms.csproj b/MediaManager.Forms/MediaManager.Forms.csproj
@@ -29,55 +29,52 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
-    <Compile Include="Platforms\Windows-common\**\*.cs" />
+    <Compile Include="Platforms\Windows\**\*.cs" />
     <Compile Condition=" '$(OS)' == 'Windows_NT' " Include="Platforms\Uap\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Mac\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Tvos\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Watchos\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
     <Compile Include="Platforms\Android\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
     <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Core" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Dash" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Hls" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.UI" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Cast" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Leanback" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.8.3" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Core" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Dash" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Hls" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.UI" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Cast" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Leanback" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.8.4" />
     <PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
     <Compile Include="Platforms\Tizen\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
-    <PackageReference Include="Tizen.NET" Version="4.0.0">
-      <ExcludeAssets>Runtime</ExcludeAssets>
-    </PackageReference>
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/MediaManager/IMediaPlayer.cs b/MediaManager/IMediaPlayer.cs
@@ -37,7 +37,7 @@ public interface IMediaPlayer
         // <summary>
         /// Adds MediaFile to the Queue and starts playing
         /// </summary>
-        Task Play(IMediaItem mediaItem);
+        Task Play(string Url);
 
         // <summary>
         /// Starts playing

diff --git a/MediaManager/Media/IMediaQueue.cs b/MediaManager/Media/IMediaQueue.cs
@@ -1,6 +1,10 @@
-namespace MediaManager.Media
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+
+namespace MediaManager.Media
 {
-    public interface IMediaQueue
+    public interface IMediaQueue : IList<IMediaItem>, INotifyCollectionChanged, INotifyPropertyChanged
     {
     }
 }
diff --git a/MediaManager/Media/MediaQueue.cs b/MediaManager/Media/MediaQueue.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Text;
 
 namespace MediaManager.Media
 {
-    public class MediaQueue : IMediaQueue
+    public class MediaQueue : ObservableCollection<IMediaItem>, IMediaQueue
     {
     }
 }
diff --git a/MediaManager/MediaManager.csproj b/MediaManager/MediaManager.csproj
@@ -1,12 +1,21 @@
 <Project Sdk="MSBuild.Sdk.Extras">
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;net461;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40;uap10.0.16299</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;net461;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid81;tizen40</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
+    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;MonoAndroid81;</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;Xamarin.iOS10</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <AssemblyName>MediaManager</AssemblyName>
     <RootNamespace>MediaManager</RootNamespace>
     <PackageId>MediaManager</PackageId>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <Compile Remove="Platforms\**\*.cs" />
     <None Include="Platforms\**\*.cs" />
@@ -29,55 +38,52 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
-    <Compile Include="Platforms\Windows-common\**\*.cs" />
+    <Compile Include="Platforms\Windows\**\*.cs" />
     <Compile Condition=" '$(OS)' == 'Windows_NT' " Include="Platforms\Uap\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Mac\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Tvos\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
     <Compile Include="Platforms\Apple-common\**\*.cs" />
     <Compile Include="Platforms\Watchos\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
     <Compile Include="Platforms\Android\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
     <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Core" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Dash" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Hls" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.UI" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Cast" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Leanback" Version="2.8.3" />
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.8.3" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Core" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Dash" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Hls" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.UI" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Cast" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Leanback" Version="2.8.4" />
+    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.8.4" />
     <PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
     <Compile Include="Platforms\Tizen\**\*.cs" />
-    <Compile Include="Platforms\Xamarin-common\**\*.cs" />
-    <PackageReference Include="Tizen.NET" Version="4.0.0">
-      <ExcludeAssets>Runtime</ExcludeAssets>
-    </PackageReference>
+    <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/MediaManager/MediaManagerBase.cs b/MediaManager/MediaManagerBase.cs
@@ -12,7 +12,7 @@ namespace MediaManager
 {
     public abstract class MediaManagerBase : IMediaManager
     {
-        public abstract IAudioPlayer AudioPlayer { get; set; }
+        //public abstract IAudioPlayer AudioPlayer { get; set; }
         public abstract IVideoPlayer VideoPlayer { get; set; }
         public abstract INotificationManager NotificationManager { get; set; }
 

diff --git a/MediaManager/MediaManagerExtensions.cs b/MediaManager/MediaManagerExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using MediaManager.Media;
 
@@ -8,13 +9,16 @@ public static class MediaManagerExtensions
     {
         public static Task Play(this IMediaManager mediaManager, IMediaItem item)
         {
-            return mediaManager.PlaybackManager.CurrentMediaPlayer.Play(item);
+            return mediaManager.PlaybackManager.Play(item);
         }
 
         public static Task Play(this IMediaManager mediaManager, IEnumerable<IMediaItem> items)
         {
-            mediaManager.MediaQueue.Add(items);
-            return mediaManager.PlaybackManager.CurrentMediaPlayer.Play(item);
+            foreach (var item in items)
+            {
+                mediaManager.MediaQueue.Add(item);
+            }
+            return mediaManager.PlaybackManager.Play(items.First());
         }
     }
 }
diff --git a/MediaManager/Platforms/Android/AudioPlayer.cs b/MediaManager/Platforms/Android/AudioPlayer.cs
@@ -37,10 +37,10 @@ public Task Pause()
             throw new NotImplementedException();
         }
 
-        public Task Play(IMediaItem item)
+        public Task Play(string Url)
         {
-            var mediaUrl = item.MetadataMediaUri;
-            var mediaUri = Android.Net.Uri.Parse(mediaUrl);
+            //var mediaUrl = item.MetadataMediaUri;
+            var mediaUri = Android.Net.Uri.Parse(Url);
 
             var userAgent = Util.GetUserAgent(context, "ExoPlayerDemo");
             var defaultHttpDataSourceFactory = new DefaultHttpDataSourceFactory(userAgent);