Merge branch 'master' of https://github.com/newyorkpizza/SlackTextViewController into newyorkpizza-master

dzenbot · dzenbot · commit 662ad7f3fd25 · 2015-01-20T02:33:19.000-03:00
diff --git a/Source/Classes/SLKTextInputbar.h b/Source/Classes/SLKTextInputbar.h
@@ -60,6 +60,18 @@ typedef NS_ENUM(NSUInteger, SLKCounterStyle) {
 /** YES if the maxmimum character count has been exceeded. */
 @property (nonatomic, readonly) BOOL limitExceeded;
 
+///------------------------------------------------
+/// @name Initialization
+///------------------------------------------------
+
+/**
+ Initializes a text input bar with a class to be used for the text view
+ 
+ @param textViewClass The class to be used when creating the text view. May be nil. If provided, the class must be a subclass of SLKTextView
+ @return An initialized SLKTextInputbar object or nil if the object could not be created.
+ */
+- (instancetype)initWithTextViewClass:(Class)textViewClass;
+
 
 ///------------------------------------------------
 /// @name Text Editing
diff --git a/Source/Classes/SLKTextInputbar.m b/Source/Classes/SLKTextInputbar.m
@@ -32,13 +32,23 @@ @interface SLKTextInputbar ()
 @property (nonatomic, strong) NSLayoutConstraint *accessoryViewHC;
 
 @property (nonatomic, strong) UILabel *charCountLabel;
+@property (nonatomic, strong) Class textViewClass;
 
 @end
 
 @implementation SLKTextInputbar
 
 #pragma mark - Initialization
 
+- (instancetype)initWithTextViewClass:(Class)textViewClass
+{
+    if (self = [super init]) {
+        self.textViewClass = textViewClass;
+        [self commonInit];
+    }
+    return self;
+}
+
 - (id)init
 {
     if (self = [super init]) {
@@ -106,7 +116,8 @@ - (SLKTextView *)textView
 {
     if (!_textView)
     {
-        _textView = [SLKTextView new];
+        Class TextViewClass = self.textViewClass ? self.textViewClass : [SLKTextView class];
+        _textView = [TextViewClass new];
         _textView.translatesAutoresizingMaskIntoConstraints = NO;
         _textView.font = [UIFont systemFontOfSize:15.0];
         _textView.maxNumberOfLines = [self defaultNumberOfLines];
diff --git a/Source/Classes/SLKTextViewController.h b/Source/Classes/SLKTextViewController.h
@@ -400,4 +400,15 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
 /** UIGestureRecognizerDelegate */
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer NS_REQUIRES_SUPER;
 
+
+///------------------------------------------------
+/// @name Customization
+///------------------------------------------------
+/**
+ Allows for customizing behavior and appearance by using a subclass of SLKTextView
+ 
+ @param textViewClass The class of the SLKTextView subclass
+ */
+- (void)registerClassForTextView:(Class)textViewClass;
+
 @end
diff --git a/Source/Classes/SLKTextViewController.m b/Source/Classes/SLKTextViewController.m
@@ -63,6 +63,9 @@ @interface SLKTextViewController () <UIGestureRecognizerDelegate, UIAlertViewDel
 // The setter of isExternalKeyboardDetected, for private use.
 @property (nonatomic, getter = isRotating) BOOL rotating;
 
+// The subclass of SLKTextView class to use
+@property (nonatomic, strong) Class textViewClass;
+
 @end
 
 @implementation SLKTextViewController
@@ -276,7 +279,7 @@ - (SLKTextInputbar *)textInputbar
 {
     if (!_textInputbar)
     {
-        _textInputbar = [SLKTextInputbar new];
+        _textInputbar = [[SLKTextInputbar alloc] initWithTextViewClass:self.textViewClass];
         _textInputbar.translatesAutoresizingMaskIntoConstraints = NO;
         _textInputbar.controller = self;
         
@@ -1930,4 +1933,12 @@ - (void)dealloc
     [self unregisterNotifications];
 }
 
+#pragma mark - Customization
+
+- (void)registerClassForTextView:(Class)textViewClass
+{
+    NSAssert([textViewClass isSubclassOfClass:[SLKTextView class]], @"The registered class is invalid, it must be a subclass of SLKTextView.");
+    self.textViewClass = textViewClass;
+}
+
 @end
