[facebook] Updated binding to version 4.6

mono · Sep 21, 2015 · b04f136 · b04f136
1 parent 5de9f11
commit b04f136
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 9 deletions.
diff --git a/facebookios/binding/ApiDefinition.cs b/facebookios/binding/ApiDefinition.cs
@@ -965,7 +965,7 @@ interface AppLinkResolving
 namespace Facebook.LoginKit
 {
 	// @interface FBSDKLoginButton : FBSDKButton
-	[BaseType (typeof(CoreKit.Button),
+	[BaseType (typeof(Facebook.CoreKit.Button),
 		Name = "FBSDKLoginButton",
 		Delegates = new [] { "Delegate" },
 		Events = new [] { typeof(LoginButtonDelegate) })]
@@ -1036,6 +1036,11 @@ interface LoginButtonDelegate
 		[EventName ("LoggedOut")]
 		[Export ("loginButtonDidLogOut:")]
 		void DidLogOut (LoginButton loginButton);
+
+		[DelegateName ("LoginButtonWillLogin")]
+		[DefaultValue (true)]
+		[Export ("loginButtonWillLogin:")]
+		bool WillLogin (LoginButton loginButton);
 	}
 
 	// typedef void (^FBSDKLoginManagerRequestTokenHandler)(FBSDKLoginManagerLoginResult *NSError *);
@@ -1056,15 +1061,27 @@ interface LoginManager
 		LoginBehavior LoginBehavior { get; set; }
 
 		// -(void)logInWithReadPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler;
+		[Obsolete ("Use LogInWithReadPermissions (string[], UIViewController, LoginManagerRequestTokenHandler) method instead")]
 		[Async]
 		[Export ("logInWithReadPermissions:handler:")]
 		void LogInWithReadPermissions ([NullAllowed] string[] permissions, LoginManagerRequestTokenHandler handler);
 
 		// -(void)logInWithPublishPermissions:(NSArray *)permissions handler:(FBSDKLoginManagerRequestTokenHandler)handler;
+		[Obsolete ("Use LogInWithPublishPermissions (string[], UIViewController, LoginManagerRequestTokenHandler) method instead")]
 		[Async]
 		[Export ("logInWithPublishPermissions:handler:")]
 		void LogInWithPublishPermissions ([NullAllowed] string[] permissions, LoginManagerRequestTokenHandler handler);
 
+		// - (void)logInWithReadPermissions:(NSArray *)permissions fromViewController:(UIViewController *)fromViewController handler:(FBSDKLoginManagerRequestTokenHandler)handler;
+		[Async]
+		[Export ("logInWithReadPermissions:fromViewController:handler:")]
+		void LogInWithReadPermissions ([NullAllowed] string[] permissions, UIViewController fromViewController, LoginManagerRequestTokenHandler handler);
+
+		// - (void)logInWithPublishPermissions:(NSArray *)permissions fromViewController:(UIViewController *)fromViewController handler:(FBSDKLoginManagerRequestTokenHandler)handler;
+		[Async]
+		[Export ("logInWithPublishPermissions:fromViewController:handler:")]
+		void LogInWithPublishPermissions ([NullAllowed] string[] permissions, UIViewController fromViewController, LoginManagerRequestTokenHandler handler);
+
 		// -(void)logOut;
 		[Export ("logOut")]
 		void LogOut ();
@@ -1612,10 +1629,21 @@ interface AppInviteContent : CoreKit.Copying, INSSecureCoding
 	interface AppInviteDialog
 	{
 		// +(instancetype)showWithContent:(FBSDKAppInviteContent *)content delegate:(id<FBSDKAppInviteDialogDelegate>)delegate;
+		[Obsolete ("Use Show (UIViewController, AppInviteContent, IAppInviteDialogDelegate) method instead")]
 		[Static]
 		[Export ("showWithContent:delegate:")]
 		AppInviteDialog Show ([NullAllowed] AppInviteContent content, [NullAllowed] IAppInviteDialogDelegate aDelegate);
 
+		// + (instancetype)showFromViewController:(UIViewController *)viewController withContent:(FBSDKAppInviteContent *)content delegate:(id<FBSDKAppInviteDialogDelegate>)delegate;
+		[Static]
+		[Export ("showFromViewController:withContent:delegate:")]
+		AppInviteDialog Show (UIViewController fromViewController, [NullAllowed] AppInviteContent content, [NullAllowed] IAppInviteDialogDelegate aDelegate);
+
+		// @property (nonatomic, weak) UIViewController *fromViewController;
+		[NullAllowed]
+		[Export ("fromViewController", ArgumentSemantic.Weak)]
+		UIViewController FromViewController { get; set; }
+
 		// @property (nonatomic, weak) id<FBSDKAppInviteDialogDelegate> delegate;
 		[NullAllowed]
 		[Export ("delegate", ArgumentSemantic.Weak)]
@@ -1927,7 +1955,7 @@ interface ShareAPI : Sharing
 	}
 
 	// @interface FBSDKShareButton : FBSDKButton <FBSDKSharingButton>
-	[BaseType (typeof(CoreKit.Button), Name = "FBSDKShareButton")]
+	[BaseType (typeof(Facebook.CoreKit.Button), Name = "FBSDKShareButton")]
 	interface ShareButton : SharingButton
 	{
 

diff --git a/facebookios/binding/FBSDKCoreKit.linkwith.cs b/facebookios/binding/FBSDKCoreKit.linkwith.cs
@@ -1,4 +1,4 @@
 using System;
 using ObjCRuntime;
 
-[assembly: LinkWith ("FBSDKCoreKit.a", LinkTarget.ArmV7 | LinkTarget.ArmV7s | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
+[assembly: LinkWith ("FBSDKCoreKit.a", LinkTarget.ArmV7 | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
diff --git a/facebookios/binding/FBSDKLoginKit.linkwith.cs b/facebookios/binding/FBSDKLoginKit.linkwith.cs
@@ -1,4 +1,4 @@
 using System;
 using ObjCRuntime;
 
-[assembly: LinkWith ("FBSDKLoginKit.a", LinkTarget.ArmV7 | LinkTarget.ArmV7s | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
+[assembly: LinkWith ("FBSDKLoginKit.a", LinkTarget.ArmV7 | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
diff --git a/facebookios/binding/FBSDKMessengerShareKit.linkwith.cs b/facebookios/binding/FBSDKMessengerShareKit.linkwith.cs
@@ -1,4 +1,4 @@
 using System;
 using ObjCRuntime;
 
-[assembly: LinkWith ("FBSDKMessengerShareKit.a", LinkTarget.ArmV7 | LinkTarget.ArmV7s | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
+[assembly: LinkWith ("FBSDKMessengerShareKit.a", LinkTarget.ArmV7 | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
diff --git a/facebookios/binding/FBSDKShareKit.linkwith.cs b/facebookios/binding/FBSDKShareKit.linkwith.cs
@@ -1,4 +1,4 @@
 using System;
 using ObjCRuntime;
 
-[assembly: LinkWith ("FBSDKShareKit.a", LinkTarget.ArmV7 | LinkTarget.ArmV7s | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
+[assembly: LinkWith ("FBSDKShareKit.a", LinkTarget.ArmV7 | LinkTarget.Arm64 | LinkTarget.Simulator | LinkTarget.Simulator64, LinkerFlags = "-ObjC", SmartLink = true, ForceLoad = true)]
diff --git a/facebookios/binding/Facebook.csproj b/facebookios/binding/Facebook.csproj
@@ -36,6 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
+    <Folder Include="Resources\FacebookSDKStrings.bundle\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -69,4 +70,50 @@
     <ObjcBindingNativeLibrary Include="FBSDKShareKit.a" />
     <ObjcBindingNativeLibrary Include="Bolts.a" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\af.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ar.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\bn.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\cs.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\da.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\de.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\el.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\en.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\en_GB.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\es.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\es_ES.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\fi.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\fil.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\fr.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\gu.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\he.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\hi.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\hr.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\hu.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\id.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\it.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ja.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\kn.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ko.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ml.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\mr.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ms.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\nb.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\nl.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\pa.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\pl.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\pt.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\pt_PT.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ru.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\sk.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\sv.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\ta.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\te.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\th.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\tr.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\vi.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\zh.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\zh_Hant_HK.lproj\FacebookSDK.strings" />
+    <BundleResource Include="Resources\FacebookSDKStrings.bundle\Resources\zh_Hant_TW.lproj\FacebookSDK.strings" />
+  </ItemGroup>
 </Project>
diff --git a/facebookios/binding/Makefile b/facebookios/binding/Makefile
@@ -1,6 +1,6 @@
 MONOXBUILD=/Library/Frameworks/Mono.framework/Commands/xbuild
-DATE=20150813
-VERSION=4.5.1
+DATE=20150910
+VERSION=4.6
 
 all: Facebook-Unified.dll
 
@@ -12,7 +12,11 @@ FBSDKCoreKit.a:
 	unzip -p FacebookSDKs-iOS-$(DATE).zip 'FBSDKMessengerShareKit.framework/FBSDKMessengerShareKit' > FBSDKMessengerShareKit.a
 	unzip -p FacebookSDKs-iOS-$(DATE).zip 'FBSDKShareKit.framework/FBSDKShareKit' > FBSDKShareKit.a
 
-Facebook-Unified.dll: Makefile ApiDefinition.cs StructsAndEnums.cs FBSDKCoreKit.a
+Resources/FacebookSDKStrings.bundle:
+	mkdir -p Resources
+	unzip FacebookSDKs-iOS-$(DATE).zip 'FacebookSDKStrings.bundle/*' -d Resources/
+
+Facebook-Unified.dll: Makefile ApiDefinition.cs StructsAndEnums.cs FBSDKCoreKit.a Resources/FacebookSDKStrings.bundle
 	$(MONOXBUILD) /t:Clean Facebook.csproj
 	$(MONOXBUILD) /p:Configuration=Release Facebook.csproj
 	mkdir -p build/unified/