Replaced MediaPicker with Xamarin.MediaGallery

BitooBit · web-flow · commit e94868637955 · 2021-05-24T17:45:39.000+03:00
diff --git a/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj b/src/BitooBitImageEditor.Droid/BitooBitImageEditor.Droid.csproj
@@ -65,6 +65,9 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.8.0.1560</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.MediaGallery">
+      <Version>1.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\strings.xml" />
diff --git a/src/BitooBitImageEditor.Droid/Platform.cs b/src/BitooBitImageEditor.Droid/Platform.cs
@@ -23,14 +23,16 @@ public static void Init(FormsAppCompatActivity activity, Bundle bundle)
         {
             CurrentActivity = activity;
             CurrentBundle = bundle;
+            NativeMedia.Platform.Init(activity, bundle);
             IsInitialized = true;
             LinkAssemblies();
         }
 
         /// <summary>required to get an image from the gallery</summary>
         public static void OnActivityResult(int requestCode, Result resultCode, Intent intent)
         {
-            
+            if (NativeMedia.Platform.CheckCanProcessResult(requestCode, resultCode, intent))
+                NativeMedia.Platform.OnActivityResult(requestCode, resultCode, intent);
         }
 
         public static void OnBackPressed()
diff --git a/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj b/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj
@@ -62,6 +62,9 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.8.0.1560</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.MediaGallery">
+      <Version>1.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/src/BitooBitImageEditor/BitooBitImageEditor.csproj b/src/BitooBitImageEditor/BitooBitImageEditor.csproj
@@ -107,6 +107,7 @@
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.2" />
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
     <PackageReference Include="Xamarin.Forms" Version="4.8.0.1560" />
+    <PackageReference Include="Xamarin.MediaGallery" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BitooBitImageEditor/ImageEditor.cs b/src/BitooBitImageEditor/ImageEditor.cs
@@ -6,6 +6,8 @@
 using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Essentials;
+using NativeMedia;
+using System.Linq;
 
 namespace BitooBitImageEditor
 {
@@ -66,7 +68,7 @@ public async Task<byte[]> GetEditedImage(SKBitmap bitmap = null, ImageEditorConf
                 ImageEditLock = true;
                 if (bitmap == null)
                 {
-                    var result = await MediaPicker.PickPhotoAsync();
+                    var result = (await MediaGallery.PickAsync(1, MediaFileType.Image))?.Files?.FirstOrDefault();
                     if (result != null)
                         using (Stream stream = await result.OpenReadAsync())
                             bitmap = stream != null ? SKBitmap.Decode(stream) : null;
diff --git a/src/SampleImageEditor/SampleImageEditor.Android/Resources/Resource.designer.cs b/src/SampleImageEditor/SampleImageEditor.Android/Resources/Resource.designer.cs

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,16 @@ public static void Init(FormsAppCompatActivity activity, Bundle bundle)`
`23`	`23`	`{`
`24`	`24`	`CurrentActivity = activity;`
`25`	`25`	`CurrentBundle = bundle;`
	`26`	`+ NativeMedia.Platform.Init(activity, bundle);`
`26`	`27`	`IsInitialized = true;`
`27`	`28`	`LinkAssemblies();`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`/// <summary>required to get an image from the gallery</summary>`
`31`	`32`	`public static void OnActivityResult(int requestCode, Result resultCode, Intent intent)`
`32`	`33`	`{`
`33`		`-`
	`34`	`+ if (NativeMedia.Platform.CheckCanProcessResult(requestCode, resultCode, intent))`
	`35`	`+ NativeMedia.Platform.OnActivityResult(requestCode, resultCode, intent);`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public static void OnBackPressed()`