Merge pull request #7 from muak/bugfix#6

Bugfix#6
muak · Oct 13, 2017 · ad5018e · ad5018e
2 parents 3fcedeb + 968b8cb
commit ad5018e
Show file tree

Hide file tree

Showing 13 changed files with 2,788 additions and 2,674 deletions.
diff --git a/ImageEdit/Plugin.ImageEdit.Abstractions/IEditableImage.cs b/ImageEdit/Plugin.ImageEdit.Abstractions/IEditableImage.cs
@@ -73,5 +73,11 @@ public interface IEditableImage:IDisposable
         /// </summary>
         /// <returns>The ARGB pixels.</returns>
         int[] ToArgbPixels();
+
+        /// <summary>
+        /// Get native image. return UIImage on iOS, Bitmap on Android.
+        /// </summary>
+        /// <returns>The native image.</returns>
+        object GetNativeImage();
     }
 }
diff --git a/ImageEdit/Plugin.ImageEdit.Android/EditableImage.cs b/ImageEdit/Plugin.ImageEdit.Android/EditableImage.cs
@@ -150,5 +150,9 @@ void UpdateSize()
             Height = (int)_image.Height;
         }
 
+        public object GetNativeImage()
+        {
+            return _image;
+        }
     }
 }
diff --git a/ImageEdit/Plugin.ImageEdit.iOS/EditableImage.cs b/ImageEdit/Plugin.ImageEdit.iOS/EditableImage.cs
@@ -188,7 +188,7 @@ public IEditableImage ToMonochrome()
 
         public byte[] ToJpeg(float quality = 80)
         {
-            using (var data = _image.AsJPEG(quality)) {
+            using (var data = _image.AsJPEG(quality / 100f)) {
                 return data.ToArray();
             }
         }
@@ -263,5 +263,10 @@ void UpdateSize()
             Width = (int)_image.CGImage.Width;
             Height = (int)_image.CGImage.Height;
         }
+
+        public object GetNativeImage()
+        {
+            return _image;
+        }
     }
 }
diff --git a/README.md b/README.md
@@ -154,6 +154,11 @@ var g = pixel & 0x0000FF00 >> 8;  //Get G
 var b = pixel & 0x000000FF;       //Get B
 ```
 
+## GetNativeImage
+
+Get native image on platform. 
+if platform is iOS, return UIImage; otherwise return Bitmap.
+
 ## License
 
 MIT Licensed.
diff --git a/Tests/ImageEditTests/Droid/ImageEditTests.Droid.csproj b/Tests/ImageEditTests/Droid/ImageEditTests.Droid.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>ImageEditTests.Droid</RootNamespace>
     <AssemblyName>ImageEditTests.Droid</AssemblyName>
-    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -68,21 +69,6 @@
     <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
       <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
     </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
     <Reference Include="xunit.abstractions">
       <HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
     </Reference>
@@ -101,6 +87,21 @@
     <Reference Include="xunit.runner.devices">
       <HintPath>..\packages\xunit.runner.devices.2.1.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
     </Reference>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Resources\Resource.designer.cs" />
@@ -144,4 +145,5 @@
   <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Import Project="..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Import Project="..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
+  <Import Project="..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.targets')" />
 </Project>