Skip to content

Commit 7e71a68

Browse files
martijn00martijn00
committed
Update files
1 parent 8e6c49b commit 7e71a68

File tree

20 files changed

+137
-73
lines changed

20 files changed

+137
-73
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<RepositoryUrl>https://github.com/Baseflow/XamarinMediaManager</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<Product>$(AssemblyName) ($(TargetFramework))</Product>
21-
<Version>1.0.2</Version>
21+
<Version>1.0.3</Version>
2222

2323
<!--<Nullable>enable</Nullable>-->
2424
<LangVersion>8.0</LangVersion>
@@ -86,7 +86,7 @@
8686
<PrivateAssets>all</PrivateAssets>
8787
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8888
</PackageReference>-->
89-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
89+
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
9090
<PrivateAssets>all</PrivateAssets>
9191
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9292
</PackageReference>

‎MediaManager.UnitTest/MediaManager.UnitTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>

‎MediaManager.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1818
EndProject
1919
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{6F888D07-C7FE-4257-9F3C-61EC1C1C39FA}"
2020
ProjectSection(SolutionItems) = preProject
21-
Samples\Directory.build.props = Samples\Directory.build.props
22-
Samples\Directory.build.targets = Samples\Directory.build.targets
21+
Samples\Directory.Build.props = Samples\Directory.Build.props
22+
Samples\Directory.Build.targets = Samples\Directory.Build.targets
2323
EndProjectSection
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElementPlayer.Android", "Samples\ElementPlayer.Android\ElementPlayer.Android.csproj", "{52381C0D-EAAA-42D6-BAE9-66657B9E0A21}"

‎MediaManager/Platforms/Ios/Media/MPMediaItemExtensions.cs‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ public static class MPMediaItemExtensions
1111
{
1212
public static IMediaItem ToMediaItem(this MPMediaItem item)
1313
{
14+
if (item == null)
15+
return null;
16+
#if IOS
1417
var output = new MediaItem
1518
{
16-
MediaType = MediaType.Audio,
19+
MediaType = item.MediaType.ToMediaType(),
1720
Album = item.AlbumTitle,
1821
Artist = item.Artist,
1922
Compilation = null,
@@ -37,15 +40,39 @@ public static IMediaItem ToMediaItem(this MPMediaItem item)
3740

3841
if (output.Date != null)
3942
output.Year = output.Date.Year;
40-
43+
#elif TVOS
44+
var output = new MediaItem();
45+
//TODO: something like this?
46+
/*
47+
output.MediaType = item.ValueForKey(MPMediaItem.MediaTypeProperty);
48+
output.Album = item.ValueForProperty(MPMediaItem.AlbumTitleProperty).ToString();
49+
output.Artist = item.Artist,
50+
output.Compilation = null,
51+
output.Composer = item.Composer,
52+
output.Duration = TimeSpan.FromSeconds(item.PlaybackDuration),
53+
output.Genre = item.Genre,
54+
output.Title = item.Title,
55+
output.AlbumArtist = item.AlbumArtist,
56+
output.DiscNumber = item.DiscNumber,
57+
output.MediaUri = item.AssetURL.ToString(),
58+
output.NumTracks = item.AlbumTrackCount,
59+
output.UserRating = item.Rating,
60+
output.Id = item.PersistentID.ToString()*/
61+
62+
#endif
4163
return output;
4264
}
4365

4466
public static IEnumerable<IMediaItem> ToMediaItems(this IEnumerable<MPMediaItem> items)
4567
{
68+
#if IOS
4669
return items
4770
.Where(i => i.AssetURL != null && i.IsCloudItem == false && i.HasProtectedAsset == false)
4871
.Select(i => i.ToMediaItem());
72+
#elif TVOS
73+
return items
74+
.Select(i => i.ToMediaItem());
75+
#endif
4976
}
5077
}
5178
}

‎MediaManager/Platforms/Ios/Media/MPMediaTypeExtensions.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using MediaManager.Library;
7+
using MediaPlayer;
8+
9+
namespace MediaManager.Platforms.Ios.Media
10+
{
11+
public static class MPMediaTypeExtensions
12+
{
13+
public static MediaType ToMediaType(this MPMediaType mediaType)
14+
{
15+
switch (mediaType)
16+
{
17+
case MPMediaType.Music:
18+
case MPMediaType.Podcast:
19+
case MPMediaType.AudioBook:
20+
case MPMediaType.AudioITunesU:
21+
case MPMediaType.AnyAudio:
22+
return MediaType.Audio;
23+
case MPMediaType.Movie:
24+
case MPMediaType.TVShow:
25+
case MPMediaType.VideoPodcast:
26+
case MPMediaType.MusicVideo:
27+
case MPMediaType.VideoITunesU:
28+
case MPMediaType.HomeVideo:
29+
case MPMediaType.TypeAnyVideo:
30+
return MediaType.Video;
31+
case MPMediaType.Any:
32+
default:
33+
return MediaType.Default;
34+
}
35+
}
36+
}
37+
}

Samples/Directory.build.props renamed to Samples/Directory.Build.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<Project>
2-
<PropertyGroup>
3-
<Copyright>Copyright (c) Martijn van Dijk</Copyright>
4-
<Owners>Martijn van Dijk</Owners>
5-
<Authors>Martijn van Dijk</Authors>
6-
<Product>$(AssemblyName) ($(TargetFramework))</Product>
7-
<NeutralLanguage>en</NeutralLanguage>
8-
<Version>1.0.0</Version>
9-
10-
<LangVersion>latest</LangVersion>
11-
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
12-
13-
<Platform>AnyCPU</Platform>
14-
<DebugType>full</DebugType>
15-
16-
<IsLibraryProject>$(MSBuildProjectName.Contains('MediaManager'))</IsLibraryProject>
17-
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
18-
</PropertyGroup>
1+
<Project>
2+
<PropertyGroup>
3+
<Copyright>Copyright (c) Baseflow</Copyright>
4+
<Owners>Martijn van Dijk</Owners>
5+
<Authors>Martijn van Dijk</Authors>
6+
<Product>$(AssemblyName) ($(TargetFramework))</Product>
7+
<NeutralLanguage>en</NeutralLanguage>
8+
<Version>1.0.0</Version>
9+
10+
<LangVersion>latest</LangVersion>
11+
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
12+
13+
<Platform>AnyCPU</Platform>
14+
<DebugType>full</DebugType>
15+
16+
<IsLibraryProject>$(MSBuildProjectName.Contains('MediaManager'))</IsLibraryProject>
17+
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
18+
</PropertyGroup>
1919
</Project>

Samples/Directory.build.targets renamed to Samples/Directory.Build.targets

File renamed without changes.

‎Samples/ElementPlayer.Android/ElementPlayer.Android.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,57 +90,57 @@
9090
</ItemGroup>
9191
<ItemGroup>
9292
<PackageReference Include="MvvmCross">
93-
<Version>6.5.0-alpha.201</Version>
93+
<Version>7.0.0</Version>
9494
</PackageReference>
9595
<PackageReference Include="MvvmCross.DroidX.RecyclerView">
96-
<Version>6.5.0-alpha.201</Version>
96+
<Version>7.0.0</Version>
9797
</PackageReference>
9898
<PackageReference Include="MvvmCross.Plugin.Json">
99-
<Version>6.5.0-alpha.201</Version>
99+
<Version>7.0.0</Version>
100100
</PackageReference>
101101
<PackageReference Include="MvvmCross.Plugin.Visibility">
102-
<Version>6.5.0-alpha.201</Version>
102+
<Version>7.0.0</Version>
103103
</PackageReference>
104104
<PackageReference Include="Xamarin.AndroidX.Core">
105-
<Version>1.2.0.1</Version>
105+
<Version>1.3.0.1</Version>
106106
</PackageReference>
107107
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
108-
<Version>1.0.0.1</Version>
108+
<Version>1.0.0.3</Version>
109109
</PackageReference>
110110
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
111-
<Version>1.0.0.1</Version>
111+
<Version>1.0.0.3</Version>
112112
</PackageReference>
113113
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
114114
<PackageReference Include="Xamarin.AndroidX.Fragment">
115-
<Version>1.2.4.1</Version>
115+
<Version>1.2.5.1</Version>
116116
</PackageReference>
117117
<PackageReference Include="Xamarin.AndroidX.Media">
118-
<Version>1.1.0.1</Version>
118+
<Version>1.1.0.3</Version>
119119
</PackageReference>
120120
<PackageReference Include="Xamarin.AndroidX.Leanback">
121-
<Version>1.0.0.1</Version>
121+
<Version>1.0.0.3</Version>
122122
</PackageReference>
123123
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
124-
<Version>1.0.0.1</Version>
124+
<Version>1.0.0.3</Version>
125125
</PackageReference>
126126
<PackageReference Include="Xamarin.AndroidX.AppCompat">
127-
<Version>1.1.0.1</Version>
127+
<Version>1.2.0.2</Version>
128128
</PackageReference>
129129
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
130-
<Version>1.1.0.1</Version>
130+
<Version>1.1.0.3</Version>
131131
</PackageReference>
132132
<PackageReference Include="Xamarin.AndroidX.Palette">
133-
<Version>1.0.0.1</Version>
133+
<Version>1.0.0.3</Version>
134134
</PackageReference>
135135
<PackageReference Include="Xamarin.AndroidX.RecyclerView">
136-
<Version>1.1.0.1</Version>
136+
<Version>1.1.0.3</Version>
137137
</PackageReference>
138-
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.6.1" />
138+
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.7" />
139139
<PackageReference Include="Xamarin.AndroidX.Browser">
140-
<Version>1.2.0.1</Version>
140+
<Version>1.2.0.2</Version>
141141
</PackageReference>
142142
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
143-
<Version>2.2.0.1</Version>
143+
<Version>2.2.0.2</Version>
144144
</PackageReference>
145145
</ItemGroup>
146146
<ItemGroup>

‎Samples/ElementPlayer.Core/ElementPlayer.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="MvvmCross" Version="6.5.0-alpha.201" />
22-
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.5.0-alpha.201" />
23-
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="6.5.0-alpha.201" />
21+
<PackageReference Include="MvvmCross" Version="7.0.0" />
22+
<PackageReference Include="MvvmCross.Plugin.Json" Version="7.0.0" />
23+
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="7.0.0" />
2424
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
2525
</ItemGroup>
2626

‎Samples/ElementPlayer.Forms.Android/ElementPlayer.Forms.Android.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,26 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<PackageReference Include="MvvmCross.Forms">
62-
<Version>6.5.0-alpha.201</Version>
62+
<Version>7.0.0</Version>
6363
</PackageReference>
6464
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
6565
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
66-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.1.0.1" />
67-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
68-
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.1" />
69-
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.1" />
70-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils" Version="1.0.0.1" />
71-
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.2.0.1" />
66+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.2" />
67+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.3" />
68+
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.3" />
69+
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.3" />
70+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils" Version="1.0.0.3" />
71+
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.2.0.2" />
7272
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
73-
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.6.1" />
73+
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.7" />
7474
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
75-
<Version>2.2.0.1</Version>
75+
<Version>2.2.0.2</Version>
7676
</PackageReference>
7777
<PackageReference Include="Xamarin.AndroidX.Fragment">
78-
<Version>1.2.4.1</Version>
78+
<Version>1.2.5.1</Version>
7979
</PackageReference>
8080
<PackageReference Include="Xamarin.AndroidX.Media">
81-
<Version>1.1.0.1</Version>
81+
<Version>1.1.0.3</Version>
8282
</PackageReference>
8383
</ItemGroup>
8484
<ItemGroup>

0 commit comments

Comments
 (0)