BitooBit · BitooBit · Jan 23, 2020 · Jan 22, 2020 · Jan 22, 2020 · Jan 22, 2020
diff --git a/nuget/BitooBitImageEditor.1.0.1.4.nupkg b/nuget/BitooBitImageEditor.1.0.1.4.nupkg
diff --git a/nuget/BitooBitImageEditor.1.0.1.5-beta.nupkg b/nuget/BitooBitImageEditor.1.0.1.5-beta.nupkg
diff --git a/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj b/src/BitooBitImageEditor.IOS/BitooBitImageEditor.IOS.csproj
@@ -42,6 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ImageHelper.cs" />
+    <Compile Include="IOSHapticFeedback.cs" />
     <Compile Include="Platform.cs" />
     <Compile Include="PlatformHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/src/BitooBitImageEditor.IOS/IOSHapticFeedback.cs b/src/BitooBitImageEditor.IOS/IOSHapticFeedback.cs
@@ -0,0 +1,26 @@
+using System;
+using BitooBitImageEditor.Helper;
+using BitooBitImageEditor.IOS;
+using UIKit;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+[assembly: Dependency(typeof(IOSHapticFeedback))]
+namespace BitooBitImageEditor.IOS
+{
+    class IOSHapticFeedback : IHapticFeedback
+    {
+        public void Excute()
+        {
+            if (UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
+            {
+                var impact = new UIImpactFeedbackGenerator(UIImpactFeedbackStyle.Light);
+                impact.Prepare();
+                impact.ImpactOccurred();
+                impact.Dispose();
+            }
+            else
+                Vibration.Vibrate();
+        }
+    }
+}
diff --git a/src/BitooBitImageEditor/BitooBitImageEditor.xml b/src/BitooBitImageEditor/BitooBitImageEditor.xml
diff --git a/src/BitooBitImageEditor/Croping/CropItem.cs b/src/BitooBitImageEditor/Croping/CropItem.cs
@@ -14,17 +14,13 @@ public CropItem(string imageName, CropRotateType action)
         public string ImageName { get; set; }
         public CropRotateType Action { get; set; }
 
-
         internal static ObservableCollection<CropItem> GetCropItems(bool IsAddAllElements)
         {
-            var collect = new ObservableCollection<CropItem>
-            {
-                 new CropItem("rotate_right", CropRotateType.CropRotate)
-                ,new CropItem("crop_full", CropRotateType.CropFull)
-            };
+            var collect = new ObservableCollection<CropItem> { new CropItem("rotate_right", CropRotateType.CropRotate) };
 
             if (IsAddAllElements)
             {
+                collect.Add(new CropItem("crop_full", CropRotateType.CropFull));
                 collect.Add(new CropItem("crop_free", CropRotateType.CropFree));
                 collect.Add(new CropItem("crop_square", CropRotateType.CropSquare));
                 collect.Add(new CropItem("2_3", CropRotateType.Crop2_3));

diff --git a/src/BitooBitImageEditor/Croping/CroppingRectangle.cs b/src/BitooBitImageEditor/Croping/CroppingRectangle.cs
@@ -55,10 +55,7 @@ internal bool TestPointInsideSquare(SKPoint pixelLocation)
             SKPoint[] corners = Corners;
             float X = pixelLocation.X, Y = pixelLocation.Y;
             if (Corners[0].X < X && corners[2].X > X && corners[0].Y < Y && Corners[2].Y > Y)
-            {
                 rezult = true;
-            }
-
             return rezult;
         }
 

diff --git a/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs b/src/BitooBitImageEditor/Croping/ImageCropperCanvasView.cs
@@ -158,7 +158,7 @@ protected override void OnPaintSurface(SKPaintSurfaceEventArgs args)
             SKSurface surface = args.Surface;
             SKCanvas canvas = surface.Canvas;
 
-            canvas.Clear();
+            canvas.Clear(SkiaHelper.backgroundColor);
 
             // Calculate rectangle for displaying bitmap 
             var rect = SkiaHelper.CalculateRectangle(new SKRect(0, 0, info.Width, info.Height), bitmap);
@@ -218,13 +218,14 @@ private void Rotate()
         {
             var rotatedBitmap = new SKBitmap(bitmap.Height, bitmap.Width);
 
-            using (var surface = new SKCanvas(rotatedBitmap))
+            using (var canvas = new SKCanvas(rotatedBitmap))
             {
-                surface.Translate(rotatedBitmap.Width, 0);
-                surface.RotateDegrees(90);
-                surface.DrawBitmap(bitmap, 0, 0);
+                canvas.Translate(rotatedBitmap.Width, 0);
+                canvas.RotateDegrees(90);
+                canvas.DrawBitmap(bitmap, 0, 0);
             }
 
+            bitmap.Dispose();
             bitmap = rotatedBitmap;
 
             SetAspectRatio(aspectRatio);
@@ -247,12 +248,14 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     aspectRatio = null;
+                    touchPoints?.Clear();
                     touchPoints = null;
+                    touchPointsInside?.Clear();
                     touchPointsInside = null;
                 }
 
-                ((IDisposable)bitmap).Dispose();
-
+                bitmap?.Dispose();
+                bitmap = null;
                 disposedValue = true;
             }
         }