Merge pull request #246 from xamarin/updates/slack

[SlackTextViewController] Updated to (almost) v1.9.6 to fix iOS 11 bugs
xamarin · Oct 19, 2017 · 22b1edb · 22b1edb
2 parents e524ae9 + 092fd42
commit 22b1edb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/iOS/SlackTextViewController/build.cake b/iOS/SlackTextViewController/build.cake
@@ -7,7 +7,7 @@ var IOS_PODS = new List<string> {
 	"platform :ios, '7.0'",
 	"install! 'cocoapods', :integrate_targets => false",
 	"target 'Xamarin' do",
-	"pod 'SlackTextViewController', '1.9.5'",
+	"  pod 'SlackTextViewController', :git => 'https://github.com/slackhq/SlackTextViewController.git', :commit => '4c74cbab29408dda9af33633f86dcc983a3b5363'",
 	"end",
 };
 

diff --git a/iOS/SlackTextViewController/component/component.yaml b/iOS/SlackTextViewController/component/component.yaml
@@ -1,4 +1,4 @@
-version: "1.9.5"
+version: "1.9.6"
 name: SlackTextViewController
 id: SlackTextViewController
 publisher: Xamarin Inc
@@ -13,7 +13,7 @@ no_build: true
 is_shell: true
 local-nuget-repo: ../output
 packages:
-  ios-unified: Xamarin.SlackTextViewController, Version=1.9.5
+  ios-unified: Xamarin.SlackTextViewController, Version=1.9.6
 libraries:
   ios-unified: ../output/unified/SlackTextViewController.dll
 

diff --git a/iOS/SlackTextViewController/nuget/SlackTextViewController.nuspec b/iOS/SlackTextViewController/nuget/SlackTextViewController.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Xamarin.SlackTextViewController</id>
     <title>SlackTextViewController for Xamarin.iOS</title>
-    <version>1.9.5</version>
+    <version>1.9.6-preview</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/iOS/SlackTextViewController/source/SlackTextViewController/ApiDefinition.cs b/iOS/SlackTextViewController/source/SlackTextViewController/ApiDefinition.cs
@@ -48,8 +48,8 @@ interface SlackTextInput : IUITextInput
 		string WordAt (NSRange range, ref NSRange rangeInText);
 	}
 
-	// @interface SLKTextInputbar : UIToolbar
-	[BaseType (typeof(UIToolbar), Name = "SLKTextInputbar")]
+	// @interface SLKTextInputbar : UIView
+	[BaseType (typeof(UIView), Name = "SLKTextInputbar")]
 	interface SlackTextInputbar
 	{
 		// extern NSString *const SLKTextInputbarDidMoveNotification __attribute__((visibility("default")));
@@ -58,11 +58,15 @@ interface SlackTextInputbar
 		NSString DidMoveNotification { get; }
 
 
-		// @property (nonatomic, strong) SLKTextView * textView;
+		// @property (nonatomic, readonly, strong) SLKTextView * textView;
 		[Export ("textView", ArgumentSemantic.Strong)]
-		SlackTextView TextView { get; set; }
+		SlackTextView TextView { get; }
+
+		// @property (nonatomic, readonly, strong) UIView *contentView;
+		[Export ("contentView", ArgumentSemantic.Strong)]
+		UIView ContentView { get; }
 
-		// @property (nonatomic, strong) SLKInputAccessoryView * inputAccessoryView;
+		// @property (nonatomic, readonly, strong) SLKInputAccessoryView * inputAccessoryView;
 		[Export ("inputAccessoryView", ArgumentSemantic.Strong)]
 		SlackInputAccessoryView SlackInputAccessoryView { get; }
 
@@ -224,6 +228,10 @@ interface SlackTextView : SlackTextInput
 		[Export ("placeholderNumberOfLines")]
 		nint PlaceholderNumberOfLines { get; set; }
 
+		// @property (nonatomic, copy, null_resettable) UIFont *placeholderFont;
+		[NullAllowed, Export ("placeholderFont")]
+		UIFont PlaceholderFont { get; set; }
+
 		// @property (readwrite, nonatomic) NSUInteger maxNumberOfLines;
 		[Export ("maxNumberOfLines")]
 		nuint MaxNumberOfLines { get; set; }
@@ -620,17 +628,17 @@ interface SlackTextViewController : SlackTextViewDelegate, IUITableViewDelegate,
 		[Export ("autoCompleting")]
 		bool AutoCompleting { [Bind ("isAutoCompleting")] get; }
 
-		// @property (readonly, copy, nonatomic) NSString * foundPrefix;
+		// @property (copy, nonatomic) NSString * foundPrefix;
 		[NullAllowed, Export ("foundPrefix")]
-		string FoundPrefix { get; }
+		string FoundPrefix { get; set; }
 
-		// @property (readonly, nonatomic) NSRange foundPrefixRange;
+		// @property (nonatomic) NSRange foundPrefixRange;
 		[Export ("foundPrefixRange")]
-		NSRange FoundPrefixRange { get; }
+		NSRange FoundPrefixRange { get; set; }
 
-		// @property (readonly, copy, nonatomic) NSString * foundWord;
+		// @property (copy, nonatomic) NSString * foundWord;
 		[NullAllowed, Export ("foundWord")]
-		string FoundWord { get; }
+		string FoundWord { get; set; }
 
 		// @property (readonly, copy, nonatomic) NSArray * registeredPrefixes;
 		[Export ("registeredPrefixes", ArgumentSemantic.Copy)]
@@ -640,10 +648,13 @@ interface SlackTextViewController : SlackTextViewDelegate, IUITableViewDelegate,
 		[Export ("registerPrefixesForAutoCompletion:")]
 		void RegisterPrefixesForAutoCompletion ([NullAllowed] string[] prefixes);
 
-		// -(BOOL)shouldProcessTextForAutoCompletion:(NSString * _Nonnull)text __attribute__((objc_requires_super));
-		[Export ("shouldProcessTextForAutoCompletion:")]
-//		[RequiresSuper]
-		bool ShouldProcessTextForAutoCompletion (string text);
+		// - (BOOL)shouldProcessTextForAutoCompletion;
+		[Export ("shouldProcessTextForAutoCompletion")]
+		bool ShouldProcessTextForAutoCompletion { get; }
+
+		// - (BOOL)shouldDisableTypingSuggestionForAutoCompletion;
+		[Export ("shouldDisableTypingSuggestionForAutoCompletion")]
+		bool ShouldDisableTypingSuggestionForAutoCompletion { get; }
 
 		// -(void)didChangeAutoCompletionPrefix:(NSString *)prefix andWord:(NSString *)word;
 		[Export ("didChangeAutoCompletionPrefix:andWord:")]

diff --git a/...kTextViewController/source/SlackTextViewController/libSlackTextViewController.linkwith.cs b/...kTextViewController/source/SlackTextViewController/libSlackTextViewController.linkwith.cs
@@ -8,7 +8,7 @@
 #endif
 
 [assembly: AssemblyVersion ("1.9.0.0")]
-[assembly: AssemblyFileVersion ("1.9.0.0")]
+[assembly: AssemblyFileVersion ("1.9.6.0")]
 
 [assembly: LinkWith (
 	"libSlackTextViewController.a",