Merge branch 'release/2.6.0'

Author: elomonaco

.gitignore

@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+.DS_Store
 *.suo
 *.user
 *.userosscache
@@ -221,7 +222,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -317,7 +318,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,5 +327,5 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/

README.md

@@ -6,7 +6,7 @@
 
 Xamarin Binding for [TOCropViewController](https://github.com/TimOliver/TOCropViewController)
 
-Based on TOCropViewController 2.5.3
+Based on TOCropViewController 2.6.0
 
 Refer to demo app on usage and also look at the official library for the full api.
 

TOCropViewController.Xamarin.Demo/TOCropViewController.Xamarin.Demo.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
@@ -25,6 +25,7 @@
     <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
+    <DeviceSpecificBuild>false</DeviceSpecificBuild>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -47,6 +48,7 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
+    <DeviceSpecificBuild>false</DeviceSpecificBuild>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>

TOCropViewController.Xamarin/ApiDefinition.cs

@@ -93,6 +93,10 @@ interface TOCropToolbar
 		[Export ("doneTextButtonTitle")]
 		string DoneTextButtonTitle { get; set; }
 
+		// @property (copy, nonatomic) UIColor * _Null_unspecified doneButtonColor;
+		[Export ("doneButtonColor", ArgumentSemantic.Copy)]
+		UIColor DoneButtonColor { get; set; }
+
 		// @property (readonly, nonatomic, strong) UIButton * _Nonnull cancelTextButton;
 		[Export ("cancelTextButton", ArgumentSemantic.Strong)]
 		UIButton CancelTextButton { get; }
@@ -109,6 +113,14 @@ interface TOCropToolbar
 		[Export ("cancelTextButtonTitle")]
 		string CancelTextButtonTitle { get; set; }
 
+		// @property (copy, nonatomic) UIColor * _Nullable cancelButtonColor;
+		[NullAllowed, Export ("cancelButtonColor", ArgumentSemantic.Copy)]
+		UIColor CancelButtonColor { get; set; }
+
+		// @property (assign, nonatomic) BOOL showOnlyIcons;
+		[Export ("showOnlyIcons")]
+		bool ShowOnlyIcons { get; set; }
+
 		// @property (readonly, nonatomic, strong) UIButton * _Nonnull rotateCounterclockwiseButton;
 		[Export ("rotateCounterclockwiseButton", ArgumentSemantic.Strong)]
 		UIButton RotateCounterclockwiseButton { get; }
@@ -473,6 +485,18 @@ interface TOCropViewController
 		[NullAllowed, Export ("cancelButtonTitle")]
 		string CancelButtonTitle { get; set; }
 
+		// @property (assign, nonatomic) BOOL showOnlyIcons;
+		[Export ("showOnlyIcons")]
+		bool ShowOnlyIcons { get; set; }
+
+		// @property (copy, nonatomic) UIColor * _Null_unspecified doneButtonColor;
+		[Export ("doneButtonColor", ArgumentSemantic.Copy)]
+		UIColor DoneButtonColor { get; set; }
+
+		// @property (copy, nonatomic) UIColor * _Nullable cancelButtonColor;
+		[NullAllowed, Export ("cancelButtonColor", ArgumentSemantic.Copy)]
+		UIColor CancelButtonColor { get; set; }
+
 		// @property (assign, nonatomic) BOOL showCancelConfirmationDialog;
 		[Export ("showCancelConfirmationDialog")]
 		bool ShowCancelConfirmationDialog { get; set; }
@@ -561,6 +585,10 @@ interface TOCropViewController
 		[Export ("initWithCroppingStyle:image:")]
 		IntPtr Constructor (TOCropViewCroppingStyle style, UIImage image);
 
+		// -(void)commitCurrentCrop;
+		[Export ("commitCurrentCrop")]
+		void CommitCurrentCrop ();
+
 		// -(void)resetCropViewLayout;
 		[Export ("resetCropViewLayout")]
 		void ResetCropViewLayout ();

TOCropViewController.Xamarin/Structs.cs

@@ -3,31 +3,31 @@
 
 namespace TimOliver.TOCropViewController.Xamarin
 {
-	[Native]
-	public enum TOCropViewCroppingStyle : long
-	{
-		Default,
-		Circular
-	}
+    [Native]
+    public enum TOCropViewCroppingStyle : long
+    {
+        Default,
+        Circular
+    }
 
-	[Native]
-	public enum TOCropViewControllerAspectRatioPreset : long
-	{
-		Original,
-		Square,
-		TOCropViewControllerAspectRatioPreset3x2,
-		TOCropViewControllerAspectRatioPreset5x3,
-		TOCropViewControllerAspectRatioPreset4x3,
-		TOCropViewControllerAspectRatioPreset5x4,
-		TOCropViewControllerAspectRatioPreset7x5,
-		TOCropViewControllerAspectRatioPreset16x9,
-		Custom
-	}
+    [Native]
+    public enum TOCropViewControllerAspectRatioPreset : long
+    {
+        Original,
+        Square,
+        TOCropViewControllerAspectRatioPreset3x2,
+        TOCropViewControllerAspectRatioPreset5x3,
+        TOCropViewControllerAspectRatioPreset4x3,
+        TOCropViewControllerAspectRatioPreset5x4,
+        TOCropViewControllerAspectRatioPreset7x5,
+        TOCropViewControllerAspectRatioPreset16x9,
+        Custom
+    }
 
-	[Native]
-	public enum TOCropViewControllerToolbarPosition : long
-	{
-		Bottom,
-		Top
-	}
+    [Native]
+    public enum TOCropViewControllerToolbarPosition : long
+    {
+        Bottom,
+        Top
+    }
 }

TOCropViewController.Xamarin/TimOliver.TOCropViewController.Xamarin.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>TimOliver.TOCropViewController.Xamarin</id>
-    <version>2.5.4</version>
+    <version>2.6.0</version>
     <title>TOCropViewController.Xamarin</title>
     <description>Xamarin Binding for TOCropViewController</description>
     <summary>Xamarin Binding for TOCropViewController</summary>
@@ -17,7 +17,7 @@
         </group>
     </dependencies>
     <releaseNotes>
-        Based off of TOCropViewController 2.5.4
+        Based off of TOCropViewController 2.6.0
     </releaseNotes>
     </metadata>
     <files>