Fixed update to 3.0 bugs

Baseflow · Sep 23, 2015 · b9c32c7 · b9c32c7
1 parent 65e7af2
commit b9c32c7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/VlcXamarin.Sample/MainActivity.cs b/VlcXamarin.Sample/MainActivity.cs
@@ -35,7 +35,7 @@ protected override void OnCreate (Bundle bundle)
             button.Click += delegate {
                 button.Text = string.Format ("{0} clicks!", count++);
 
-                MediaLibVLC m = new MediaLibVLC(mLibVLC, "http://www.montemagno.com/sample.mp3");
+                var m = new MediaLibVLC(mLibVLC, Android.Net.Uri.Parse("http://www.montemagno.com/sample.mp3"));
 
                 // Tell the media player to play the new Media.
                 mMediaPlayer.Media = m;

diff --git a/VlcXamarin.Sample/Properties/AndroidManifest.xml b/VlcXamarin.Sample/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.vlcxamarin.sample">
-	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22" />
+	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="21" />
 	<application android:label="VlcXamarin.Sample"></application>
 </manifest>
diff --git a/VlcXamarin.Sample/Resources/layout/Main.axml b/VlcXamarin.Sample/Resources/layout/Main.axml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<Button  
-    android:id="@+id/myButton"
-    android:layout_width="match_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
-</LinearLayout>
-
+    android:layout_height="fill_parent">
+    <Button
+        android:id="@+id/myButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+</LinearLayout>
diff --git a/VlcXamarin.Sample/VlcXamarin.Sample.csproj b/VlcXamarin.Sample/VlcXamarin.Sample.csproj
@@ -15,7 +15,7 @@
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <AssemblyName>VlcXamarin.Sample</AssemblyName>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +42,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Export" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/VlcXamarin/Transforms/Metadata.xml b/VlcXamarin/Transforms/Metadata.xml
@@ -23,4 +23,6 @@
   <attr path="/api/package[@name='org.videolan.libvlc']/class[@name='VLCObject']" name="visibility">public</attr>
   <attr path="/api/package[@name='org.videolan.libvlc']/class[@name='VLCEvent']" name="visibility">public</attr>
 
+  <remove-node path="/api/package[@name='org.videolan.libvlc']/interface[@name='VLCEvent.Listener']" />
+
 </metadata>
diff --git a/VlcXamarin/VlcXamarin.csproj b/VlcXamarin/VlcXamarin.csproj
@@ -11,7 +11,7 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <AssemblyName>VlcXamarin</AssemblyName>
-    <TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>