Adopted subscript syntax

hackiftekhar · Apr 22, 2016 · 2d27f52 · 2d27f52
1 parent 8646717
commit 2d27f52
Show file tree

Hide file tree

Showing 20 changed files with 103 additions and 237 deletions.
diff --git a/Demo/Objective_C_Demo/Resources/Info.plist b/Demo/Objective_C_Demo/Resources/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.0.1</string>
+	<string>4.0.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

diff --git a/Demo/Objective_C_Demo/Third Party/IQDropDownTextField/IQDropDownTextField.m b/Demo/Objective_C_Demo/Third Party/IQDropDownTextField/IQDropDownTextField.m
@@ -149,7 +149,7 @@ - (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forC
     UILabel *labelText = [[UILabel alloc] init];
     [labelText setTextAlignment:NSTextAlignmentCenter];
     [labelText setAdjustsFontSizeToFitWidth:YES];
-    [labelText setText:[_ItemListsInternal objectAtIndex:row]];
+    [labelText setText:_ItemListsInternal[row]];
     labelText.backgroundColor = [UIColor clearColor];
 
     if (self.isOptionalDropDown && row == 0)
@@ -167,7 +167,7 @@ - (UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forC
 
 - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
 {
-    [self setSelectedItem:[_ItemListsInternal objectAtIndex:row]];
+    [self setSelectedItem:_ItemListsInternal[row]];
 }
 
 #pragma mark - UIDatePicker delegate
@@ -211,7 +211,7 @@ - (void)setSelectedRow:(NSInteger)row animated:(BOOL)animated
         }
         else
         {
-            self.text = [_ItemListsInternal objectAtIndex:row];
+            self.text = _ItemListsInternal[row];
         }
 
         [self.pickerView selectRow:row inComponent:0 animated:animated];
@@ -404,7 +404,7 @@ -(void)setIsOptionalDropDown:(BOOL)isOptionalDropDown
 
     if (_isOptionalDropDown)
     {
-        NSArray *array = [NSArray arrayWithObject:@"Select"];
+        NSArray *array = @[@"Select"];
         _ItemListsInternal = [array arrayByAddingObjectsFromArray:_itemList];
     }
     else

diff --git a/Demo/Objective_C_Demo/ViewController/Settings/OptionsViewController.m b/Demo/Objective_C_Demo/ViewController/Settings/OptionsViewController.m
@@ -31,7 +31,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 {
     OptionTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([OptionTableViewCell class])];
 
-    cell.labelOption.text = [self.options objectAtIndex:indexPath.row];
+    cell.labelOption.text = (self.options)[indexPath.row];
 
     cell.accessoryType = (indexPath.row == self.selectedIndex)  ? UITableViewCellAccessoryCheckmark    :   UITableViewCellAccessoryNone;
 

diff --git a/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m b/Demo/Objective_C_Demo/ViewController/Settings/SettingsViewController.m
diff --git a/Demo/Objective_C_Demo/ViewController/TableViewInContainerViewController.m b/Demo/Objective_C_Demo/ViewController/TableViewInContainerViewController.m
@@ -38,7 +38,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }
 
     UITextField *textField = (UITextField *)[cell.contentView viewWithTag:123];
-    textField.placeholder = [NSString stringWithFormat:@"Cell %@",[NSNumber numberWithInteger:indexPath.row]];
+    textField.placeholder = [NSString stringWithFormat:@"Cell %@",@(indexPath.row)];
 
     return cell;
 }

diff --git a/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m b/Demo/Objective_C_Demo/ViewController/TextFieldViewController.m
@@ -62,7 +62,7 @@ - (void)viewDidLoad
     returnKeyHandler = [[IQKeyboardReturnKeyHandler alloc] initWithViewController:self];
     [returnKeyHandler setLastTextFieldReturnKeyType:UIReturnKeyDone];
 
-    [dropDownTextField setItemList:[NSArray arrayWithObjects:@"Zero Line Of Code",
+    [dropDownTextField setItemList:@[@"Zero Line Of Code",
                                      @"No More UIScrollView",
                                      @"No More Subclasses",
                                      @"No More Manual Work",
@@ -78,7 +78,7 @@ - (void)viewDidLoad
                                      @"Auto adjust textView's height ",
                                      @"Adopt tintColor from textField",
                                      @"Customize keyboardAppearance",
-                                     @"play sound on next/prev/done",nil]];
+                                     @"play sound on next/prev/done"]];
 }
 
 -(void)viewWillAppear:(BOOL)animated
@@ -120,10 +120,7 @@ - (IBAction)presentClicked:(id)sender
             UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:controller];
             navigationController.navigationBar.tintColor = self.navigationController.navigationBar.tintColor;
 
-#ifdef NSFoundationVersionNumber_iOS_6_1
             navigationController.navigationBar.barTintColor = self.navigationController.navigationBar.barTintColor;
-#endif
-            navigationController.navigationBar.titleTextAttributes = self.navigationController.navigationBar.titleTextAttributes;
 
             [navigationController setModalTransitionStyle:arc4random()%4];
 

diff --git a/Demo/Objective_C_Demo/ViewController/TextSelectionViewController.m b/Demo/Objective_C_Demo/ViewController/TextSelectionViewController.m
@@ -20,9 +20,9 @@ - (void)viewDidLoad
     [super viewDidLoad];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
-    _data = [NSArray arrayWithObjects:@"Hello", @"This is a demo code", @"Issue #56", @"With mutiple cells", @"And some useless text.",
+    _data = @[@"Hello", @"This is a demo code", @"Issue #56", @"With mutiple cells", @"And some useless text.",
               @"Hello", @"This is a demo code", @"Issue #56", @"With mutiple cells", @"And some useless text.",
-              @"Hello", @"This is a demo code", @"Issue #56", @"With mutiple cells", @"And some useless text.",nil];
+              @"Hello", @"This is a demo code", @"Issue #56", @"With mutiple cells", @"And some useless text."];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -50,7 +50,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(5,7,135,30)];
         textView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
         textView.backgroundColor = [UIColor clearColor];
-        textView.text = [_data objectAtIndex:indexPath.row];
+        textView.text = _data[indexPath.row];
         textView.dataDetectorTypes = UIDataDetectorTypeAll;
         textView.scrollEnabled = NO;
         textView.editable = NO;

diff --git a/Demo/Swift_Demo/Resources/Info.plist b/Demo/Swift_Demo/Resources/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.0.1</string>
+	<string>4.0.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

diff --git a/Demo/Swift_Demo/ViewController/SettingsViewController.swift b/Demo/Swift_Demo/ViewController/SettingsViewController.swift
@@ -21,7 +21,7 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
     let keyboardManagerProperties = [
         ["Enable", "Keyboard Distance From TextField", "Prevent Showing Bottom Blank Space"],
         ["Enable AutoToolbar","Toolbar Manage Behaviour","Should Toolbar Uses TextField TintColor","Should Show TextField Placeholder","Placeholder Font"],
-        ["Can Adjust TextView","Should Fix TextView Clip"],
+        ["Can Adjust TextView"],
         ["Override Keyboard Appearance","UIKeyboard Appearance"],
         ["Should Resign On Touch Outside"],
         ["Should Play Input Clicks"],
@@ -30,7 +30,7 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
     let keyboardManagerPropertyDetails = [
         ["Enable/Disable IQKeyboardManager","Set keyboard distance from textField","Prevent to show blank space between UIKeyboard and View"],
         ["Automatic add the IQToolbar on UIKeyboard","AutoToolbar previous/next button managing behaviour","Uses textField's tintColor property for IQToolbar","Add the textField's placeholder text on IQToolbar","UIFont for IQToolbar placeholder text"],
-        ["Adjust textView's frame when it is too big in height","Adjust textView's contentInset to fix a bug"],
+        ["Adjust textView's frame when it is too big in height"],
         ["Override the keyboardAppearance for all UITextField/UITextView","All the UITextField keyboardAppearance is set using this property"],
         ["Resigns Keyboard on touching outside of UITextField/View"],
         ["Plays inputClick sound on next/previous/done click"],
@@ -93,13 +93,6 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
         self.tableView.reloadSections(NSIndexSet(index: 0), withRowAnimation: UITableViewRowAnimation.Fade)
     }
 
-    func shouldFixTextViewClipAction (sender: UISwitch) {
-
-        IQKeyboardManager.sharedManager().shouldFixTextViewClip = sender.on
-
-        self.tableView.reloadSections(NSIndexSet(index: 3), withRowAnimation: UITableViewRowAnimation.Fade)
-    }
-
     /**  "Keyboard appearance overriding    */
     func overrideKeyboardAppearanceAction (sender: UISwitch) {
 
@@ -329,22 +322,6 @@ class SettingsViewController: UITableViewController, OptionsViewControllerDelega
                 cell.switchEnable.addTarget(self, action: #selector(self.canAdjustTextViewAction(_:)), forControlEvents: UIControlEvents.ValueChanged)
 
                 return cell
-
-            case 1:
-
-                let cell = tableView.dequeueReusableCellWithIdentifier("SwitchTableViewCell") as! SwitchTableViewCell
-                cell.switchEnable.enabled = true
-
-                cell.labelTitle.text = keyboardManagerProperties[indexPath.section][indexPath.row]
-                cell.labelSubtitle.text = keyboardManagerPropertyDetails[indexPath.section][indexPath.row]
-
-                cell.switchEnable.on = IQKeyboardManager.sharedManager().shouldFixTextViewClip
-
-                cell.switchEnable.removeTarget(nil, action: nil, forControlEvents: UIControlEvents.AllEvents)
-                cell.switchEnable.addTarget(self, action: #selector(self.shouldFixTextViewClipAction(_:)), forControlEvents: UIControlEvents.ValueChanged)
-
-                return cell
-
             default:
                 break
             }

diff --git a/DemoObjCUITests/DemoObjCUITests.m b/DemoObjCUITests/DemoObjCUITests.m
@@ -338,15 +338,6 @@ - (void)testTextFieldPlaceholder {
     [keyboardDoneButton tap];
 }
 
-
-/////--------------------------
-///// @name UITextView handling
-/////--------------------------
-//
-///**
-// canAdjustTextView  Adjust textView's frame when it is too big in height. Default is NO.
-// shouldFixTextViewClip  Adjust textView's contentInset to fix a bug. for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string Default is YES.
-// */
 //- (void)testTextView {
 //    
 //}

diff --git a/IQKeyboardManager.podspec.json b/IQKeyboardManager.podspec.json
@@ -1,9 +1,9 @@
 {
   "name": "IQKeyboardManager",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "source": {
     "git": "https://github.com/hackiftekhar/IQKeyboardManager.git",
-    "tag": "v4.0.1"
+    "tag": "v4.0.2"
   },
   "summary": "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView.",
   "homepage": "https://github.com/hackiftekhar/IQKeyboardManager",

diff --git a/IQKeyboardManager/Categories/IQNSArray+Sort.h b/IQKeyboardManager/Categories/IQNSArray+Sort.h
@@ -35,11 +35,11 @@
 /**
  Returns the array by sorting the UIView's by their tag property.
  */
-- (nonnull NSArray*)sortedArrayByTag;
+@property (nonatomic, readonly, copy) NSArray * _Nonnull sortedArrayByTag;
 
 /**
  Returns the array by sorting the UIView's by their tag property.
  */
-- (nonnull NSArray*)sortedArrayByPosition;
+@property (nonatomic, readonly, copy) NSArray * _Nonnull sortedArrayByPosition;
 
 @end
diff --git a/IQKeyboardManager/Categories/IQUIView+Hierarchy.m b/IQKeyboardManager/Categories/IQUIView+Hierarchy.m
@@ -64,7 +64,7 @@ +(void)initialize
 
 -(void)_setIsAskingCanBecomeFirstResponder:(BOOL)isAskingCanBecomeFirstResponder
 {
-    objc_setAssociatedObject(self, @selector(isAskingCanBecomeFirstResponder), [NSNumber numberWithBool:isAskingCanBecomeFirstResponder], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    objc_setAssociatedObject(self, @selector(isAskingCanBecomeFirstResponder), @(isAskingCanBecomeFirstResponder), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(BOOL)isAskingCanBecomeFirstResponder

diff --git a/IQKeyboardManager/IQKeyboardManager.h b/IQKeyboardManager/IQKeyboardManager.h
@@ -136,11 +136,6 @@ extern NSInteger const kIQPreviousNextButtonToolbarTag;
  */
 @property(nonatomic, assign) BOOL canAdjustTextView;
 
-/**
- Adjust textView's contentInset to fix a bug. for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string Default is YES.
- */
-@property(nonatomic, assign) BOOL shouldFixTextViewClip;
-
 ///---------------------------------------
 /// @name UIKeyboard appearance overriding
 ///---------------------------------------

diff --git a/IQKeyboardManager/IQKeyboardManager.m b/IQKeyboardManager/IQKeyboardManager.m
@@ -157,8 +157,6 @@ @implementation IQKeyboardManager
 //TextView handling
 @synthesize canAdjustTextView                   =   _canAdjustTextView;
 
-@synthesize shouldFixTextViewClip               =   _shouldFixTextViewClip;
-
 //Resign handling
 @synthesize shouldResignOnTouchOutside          =   _shouldResignOnTouchOutside;
 
@@ -203,8 +201,6 @@ -(instancetype)init
             [self addTextFieldViewDidBeginEditingNotificationName:UITextViewTextDidBeginEditingNotification
                                     didEndEditingNotificationName:UITextViewTextDidEndEditingNotification];
 
-            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFieldViewDidChange:) name:UITextViewTextDidChangeNotification object:nil];
-
             //  Registering for orientation changes notification
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willChangeStatusBarOrientation:) name:UIApplicationWillChangeStatusBarOrientationNotification object:nil];
 
@@ -243,14 +239,13 @@ -(instancetype)init
             strongSelf.enabledTouchResignedClasses = [[NSMutableSet alloc] init];
 
             [self setShouldToolbarUsesTextFieldTintColor:NO];
-            [self setShouldFixTextViewClip:YES];
         });
     }
     return self;
 }
 
 /*  Automatically called from the `+(void)load` method. */
-+ (instancetype)sharedManager
++ (IQKeyboardManager*)sharedManager
 {
 	//Singleton instance
 	static IQKeyboardManager *kbManager;
@@ -947,7 +942,7 @@ -(void)keyboardWillShow:(NSNotification*)aNotification
     if (_shouldAdoptDefaultKeyboardAnimation)
     {
         //  Getting keyboard animation.
-        _animationCurve = [[[aNotification userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] integerValue];
+        _animationCurve = [[aNotification userInfo][UIKeyboardAnimationCurveUserInfoKey] integerValue];
         _animationCurve = _animationCurve<<16;
     }
     else
@@ -956,15 +951,15 @@ -(void)keyboardWillShow:(NSNotification*)aNotification
     }
 
     //  Getting keyboard animation duration
-    CGFloat duration = [[[aNotification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue];
+    CGFloat duration = [[aNotification userInfo][UIKeyboardAnimationDurationUserInfoKey] floatValue];
 
     //Saving animation duration
     if (duration != 0.0)    _animationDuration = duration;
 
     CGSize oldKBSize = _kbSize;
 
     //  Getting UIKeyboardSize.
-    CGRect kbFrame = [[[aNotification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGRect kbFrame = [[aNotification userInfo][UIKeyboardFrameEndUserInfoKey] CGRectValue];
 
     CGRect screenSize = [[UIScreen mainScreen] bounds];
 
@@ -1013,7 +1008,7 @@ - (void)keyboardWillHide:(NSNotification*)aNotification
     _isKeyboardShowing = NO;
 
     //  Getting keyboard animation duration
-    CGFloat aDuration = [[[aNotification userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue];
+    CGFloat aDuration = [[aNotification userInfo][UIKeyboardAnimationDurationUserInfoKey] floatValue];
     if (aDuration!= 0.0f)
     {
         _animationDuration = aDuration;
@@ -1275,31 +1270,6 @@ -(void)textFieldViewDidEndEditing:(NSNotification*)notification
     _IQShowLog([NSString stringWithFormat:@"****** %@ ended ******",NSStringFromSelector(_cmd)]);
 }
 
-/** UITextViewTextDidChangeNotificationBug,  fix for iOS 7.0.x - http://stackoverflow.com/questions/18966675/uitextview-in-ios7-clips-the-last-line-of-text-string */
--(void)textFieldViewDidChange:(NSNotification*)notification //  (Bug ID: #18)
-{
-    if (_shouldFixTextViewClip == YES && _enable == YES)
-    {
-        UITextView *textView = (UITextView *)notification.object;
-        CGRect line = [textView caretRectForPosition: textView.selectedTextRange.start];
-        CGFloat overflow = CGRectGetMaxY(line) - (textView.contentOffset.y + CGRectGetHeight(textView.bounds) - textView.contentInset.bottom - textView.contentInset.top);
-
-        //Added overflow conditions (Bug ID: 95)
-        if ( overflow > 0  && overflow < FLT_MAX)
-        {
-            // We are at the bottom of the visible text and introduced a line feed, scroll down (iOS 7 does not do it)
-            // Scroll caret to visible area
-            CGPoint offset = textView.contentOffset;
-            offset.y += overflow + 7; // leave 7 pixels margin
-
-            // Cannot animate with setContentOffset:animated: or caret will not appear
-            [UIView animateWithDuration:_animationDuration delay:0 options:(_animationCurve|UIViewAnimationOptionBeginFromCurrentState) animations:^{
-                [textView setContentOffset:offset];
-            } completion:NULL];
-        }
-    }
-}
-
 #pragma mark - UIInterfaceOrientation Change notification methods
 /**  UIApplicationWillChangeStatusBarOrientationNotification. Need to set the textView to it's original position. If any frame changes made. (Bug ID: #92)*/
 - (void)willChangeStatusBarOrientation:(NSNotification*)aNotification
@@ -1433,7 +1403,7 @@ -(BOOL)goPrevious
     //If it is not first textField. then it's previous object becomeFirstResponder.
     if (index != NSNotFound && index > 0)
     {
-        UITextField *nextTextField = [textFields objectAtIndex:index-1];
+        UITextField *nextTextField = textFields[index-1];
 
         //  Retaining textFieldView
         UIView *textFieldRetain = _textFieldView;
@@ -1469,7 +1439,7 @@ -(BOOL)goNext
     //If it is not last textField. then it's next object becomeFirstResponder.
     if (index != NSNotFound && index < textFields.count-1)
     {
-        UITextField *nextTextField = [textFields objectAtIndex:index+1];
+        UITextField *nextTextField = textFields[index+1];
 
         //  Retaining textFieldView
         UIView *textFieldRetain = _textFieldView;
@@ -1555,7 +1525,7 @@ -(void)addToolbarIfRequired
         UITextField *textField = nil;
 
         if ([siblings count])
-            textField = [siblings objectAtIndex:0]; //Not using firstObject method because iOS5 doesn't not support 'firstObject' method.
+            textField = siblings[0];
 
         //Either there is no inputAccessoryView or if accessoryView is not appropriate for current situation(There is Previous/Next/Done toolbar).
         //setInputAccessoryView: check   (Bug ID: #307)
@@ -1731,7 +1701,7 @@ -(void)addToolbarIfRequired
 
                 //In case of UITableView (Special), the next/previous buttons has to be refreshed everytime.    (Bug ID: #56)
                 //	If firstTextField, then previous should not be enabled.
-                if ([siblings objectAtIndex:0] == textField)
+                if (siblings[0] == textField)
                 {
                     [textField setEnablePrevious:NO next:YES];
                 }
@@ -1777,7 +1747,7 @@ - (void)reloadInputViews
     for (UITextField *textField in siblings)
     {
         //	If firstTextField, then previous should not be enabled.
-        if ([siblings objectAtIndex:0] == textField)
+        if (siblings[0] == textField)
         {
             if (siblings.count == 1)
             {