Fixes #758

jamesmontemagno · Oct 16, 2019 · 2e7ee89 · 2e7ee89
1 parent 040d673
commit 2e7ee89
Show file tree

Hide file tree

Showing 8 changed files with 163 additions and 546 deletions.
diff --git a/src/Media.Plugin.Sample/Media.Plugin.Sample.Android/MainActivity.cs b/src/Media.Plugin.Sample/Media.Plugin.Sample.Android/MainActivity.cs
@@ -22,7 +22,7 @@ protected override void OnCreate(Bundle bundle)
             base.OnCreate(bundle);
 			CrossCurrentActivity.Current.Init(this, bundle);
 			Xamarin.Forms.Forms.Init(this, bundle);
-			Android.Glide.Forms.Init();
+			Android.Glide.Forms.Init(this);
 			LoadApplication(new App());
         }
 

diff --git a/src/Media.Plugin.Sample/Media.Plugin.Sample.Android/Resources/Resource.designer.cs b/src/Media.Plugin.Sample/Media.Plugin.Sample.Android/Resources/Resource.designer.cs
diff --git a/src/Media.Plugin.Sample/Media.Plugin.Sample/App.xaml.cs b/src/Media.Plugin.Sample/Media.Plugin.Sample/App.xaml.cs
@@ -11,7 +11,7 @@ public App ()
 		{
 			InitializeComponent();
 
-			MainPage = new MediaPage();
+			MainPage = new NavigationPage(new MediaPage());
 		}
 
 		protected override void OnStart ()

diff --git a/src/Media.Plugin.Sample/Media.Plugin.Sample/MediaPage.xaml b/src/Media.Plugin.Sample/Media.Plugin.Sample/MediaPage.xaml
@@ -19,5 +19,6 @@
 
 			</StackLayout>
 		</ScrollView>
+		<Button Clicked="Button_Clicked" Text="Navigate"/>
 	</StackLayout>
 </ContentPage>
diff --git a/src/Media.Plugin.Sample/Media.Plugin.Sample/MediaPage.xaml.cs b/src/Media.Plugin.Sample/Media.Plugin.Sample/MediaPage.xaml.cs
@@ -150,5 +150,10 @@ private void Files_CollectionChanged(object sender, System.Collections.Specializ
 			});
 			ImageList.Children.Add(image);
 		}
+
+		private async void Button_Clicked(object sender, EventArgs e)
+		{
+			await Navigation.PushAsync(new ContentPage());
+		}
 	}
 }
diff --git a/src/Media.Plugin/iOS/ECLImagePickerViewController.cs b/src/Media.Plugin/iOS/ECLImagePickerViewController.cs
@@ -4,7 +4,6 @@
 using UIKit;
 using AssetsLibrary;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using Foundation;
 using System.Threading.Tasks;

diff --git a/src/Media.Plugin/iOS/MediaPickerDelegate.cs b/src/Media.Plugin/iOS/MediaPickerDelegate.cs
@@ -11,10 +11,10 @@
 using NSAction = System.Action;
 using ImageIO;
 using MobileCoreServices;
-using System.Drawing;
 using System.Collections.Generic;
 using System.Threading;
 using System.Diagnostics;
+using System.Drawing;
 
 namespace Plugin.Media
 {
@@ -288,7 +288,7 @@ private async Task<MediaFile> GetPictureMediaFile(NSDictionary info)
 			if (image == null)
                 return null;
 
-			var pathExtension = ((info[UIImagePickerController.ReferenceUrl] as NSUrl).PathExtension == "PNG") ? "png" : "jpg";
+			var pathExtension = ((info[UIImagePickerController.ReferenceUrl] as NSUrl)?.PathExtension == "PNG") ? "png" : "jpg";
 
 			var path = GetOutputPath(MediaImplementation.TypeImage,
 				options.Directory ?? ((IsCaptured) ? string.Empty : "temp"),