Merge remote-tracking branch 'origin/master'

Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C0B63B9A1781FAB1008D3B64"
+               BuildableName = "IQKeyboardManager.app"
+               BlueprintName = "DemoObjC"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4C7852FA1B9DCEDE00A557B9"
+               BuildableName = "IQKeyboardManagerUITests.xctest"
+               BlueprintName = "IQKeyboardManagerUITests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4CE6119C1B98B7250020591A"
+               BuildableName = "DemoObjCUITests.xctest"
+               BlueprintName = "DemoObjCUITests"
+               ReferencedContainer = "container:Demo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0B63B9A1781FAB1008D3B64"
+            BuildableName = "IQKeyboardManager.app"
+            BlueprintName = "DemoObjC"
+            ReferencedContainer = "container:Demo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0B63B9A1781FAB1008D3B64"
+            BuildableName = "IQKeyboardManager.app"
+            BlueprintName = "DemoObjC"
+            ReferencedContainer = "container:Demo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0B63B9A1781FAB1008D3B64"
+            BuildableName = "IQKeyboardManager.app"
+            BlueprintName = "DemoObjC"
+            ReferencedContainer = "container:Demo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Demo/Objective_C_Demo/Resources/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

Demo/Swift_Demo/Resources/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

IQKeyBoardManager/IQKeyboardReturnKeyHandler.m

@@ -57,6 +57,12 @@ @implementation IQKeyboardReturnKeyHandler
 @synthesize toolbarManageBehaviour = _toolbarManageBehaviour;
 @synthesize delegate = _delegate;
 
+- (instancetype)init
+{
+    self = [self initWithViewController:nil];
+    return self;
+}
+
 -(instancetype)initWithViewController:(UIViewController*)controller
 {
     self = [super init];

IQKeyBoardManager/IQToolbar/IQTitleBarButtonItem.h

@@ -46,6 +46,6 @@
  @param frame Initial frame of barButtonItem
  @param title Title of barButtonItem.
  */
--(instancetype)initWithFrame:(CGRect)frame title:(NSString *)title NS_DESIGNATED_INITIALIZER;
+-(instancetype)initWithFrame:(CGRect)frame title:(NSString *)title;
 
 @end

IQKeyBoardManager/IQToolbar/IQTitleBarButtonItem.m

@@ -37,9 +37,10 @@ @implementation IQTitleBarButtonItem
 }
 @synthesize font = _font;
 
+
 -(instancetype)initWithFrame:(CGRect)frame title:(NSString *)title
 {
-    self = [super initWithTitle:nil style:UIBarButtonItemStylePlain target:nil action:nil];
+    self = [self initWithTitle:nil style:UIBarButtonItemStylePlain target:nil action:nil];
     if (self)
     {
         _titleView = [[UIView alloc] initWithFrame:frame];

IQKeyboardManager.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
 	s.name = "IQKeyboardManager"
-	s.version = "3.3.0"
+	s.version = "3.3.1"
 	s.summary = "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView."
 	s.homepage = "https://github.com/hackiftekhar/IQKeyboardManager"
 	s.screenshots = "https://raw.githubusercontent.com/hackiftekhar/IQKeyboardManager/master/Screenshot/IQKeyboardManagerScreenshot.png"
 	s.license = 'MIT'
 	s.author = { "Iftekhar Qurashi" => "[email protected]" }
 	s.platform = :ios, '5.0'
-	s.source = { :git => "https://github.com/hackiftekhar/IQKeyboardManager.git", :tag => "v3.3.0" }
+	s.source = { :git => "https://github.com/hackiftekhar/IQKeyboardManager.git", :tag => "v3.3.1" }
 	s.source_files = 'Classes', 'IQKeyBoardManager/**/*.{h,m}'
 	s.resources = "IQKeyBoardManager/Resources/IQKeyboardManager.bundle"
 	s.requires_arc = true

IQKeyboardManagerSwift.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
 	s.name = "IQKeyboardManagerSwift"
-	s.version = "3.3.0"
+	s.version = "3.3.1"
 	s.summary = "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView."
 	s.homepage = "https://github.com/hackiftekhar/IQKeyboardManager"
 	s.screenshots = "https://raw.githubusercontent.com/hackiftekhar/IQKeyboardManager/master/Screenshot/IQKeyboardManagerScreenshot.png"
 	s.license = 'MIT'
 	s.author = { "Iftekhar Qurashi" => "[email protected]" }
 	s.platform = :ios, '8.0'
-	s.source = { :git => "https://github.com/hackiftekhar/IQKeyboardManager.git", :tag => "v3.3.0" }
+	s.source = { :git => "https://github.com/hackiftekhar/IQKeyboardManager.git", :tag => "v3.3.1" }
 	s.source_files = 'Classes', 'IQKeyboardManagerSwift/**/*.{swift}'
 	s.resources = "IQKeyboardManagerSwift/Resources/IQKeyboardManager.bundle"
 	s.requires_arc = true

IQKeyboardManagerSwift/Categories/IQUIView+Hierarchy.swift

@@ -132,9 +132,9 @@ public extension UIView {
         while let unwrappedSuperView = superView {
 
             if unwrappedSuperView.isKindOfClass(classType) &&
-                ((InternalClass.UITableViewCellScrollViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UITableViewCellScrollViewClass!) == false) &&
-                    (InternalClass.UITableViewWrapperViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UITableViewWrapperViewClass!) == false) &&
-                    (InternalClass.UIQueuingScrollViewClass != nil && unwrappedSuperView.isKindOfClass(InternalClass.UIQueuingScrollViewClass!) == false)) {
+                ((InternalClass.UITableViewCellScrollViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UITableViewCellScrollViewClass!) == false) &&
+                    (InternalClass.UITableViewWrapperViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UITableViewWrapperViewClass!) == false) &&
+                    (InternalClass.UIQueuingScrollViewClass == nil || unwrappedSuperView.isKindOfClass(InternalClass.UIQueuingScrollViewClass!) == false)) {
                         return superView
             } else {
 

IQKeyboardManagerSwift/IQToolbar/IQUIView+IQKeyboardToolbar.swift

@@ -630,13 +630,32 @@ public extension UIView {
             //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
             let doneButton = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.Done, target: target, action: doneAction)
 
-            let prev = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft"), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            let prev : IQBarButtonItem
+            let next : IQBarButtonItem
+
+            if IQ_IS_IOS8_OR_GREATER {
+
+                // Get the top level "bundle" which may actually be the framework
+                var bundle = NSBundle(forClass: IQKeyboardManager.self)
+
+                if let resourcePath = bundle.pathForResource("IQKeyboardManager", ofType: "bundle") {
+                    if let resourcesBundle = NSBundle(path: resourcePath) {
+                        bundle = resourcesBundle;
+                    }
+                }
+
+                prev = IQBarButtonItem(image: UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+
+                next = IQBarButtonItem(image: UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil), style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            } else {
+                prev = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft"), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+
+                next = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight"), style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            }
 
             let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
             fixed.width = 23
 
-            let next = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight"), style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
-
             items.append(prev)
             items.append(fixed)
             items.append(next)
@@ -747,13 +766,32 @@ public extension UIView {
             //  Create a done button to show on keyboard to resign it. Adding a selector to resign it.
             let doneButton = IQBarButtonItem(title: rightButtonTitle, style: UIBarButtonItemStyle.Plain, target: target, action: rightButtonAction)
 
-            let prev = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft"), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            let prev : IQBarButtonItem
+            let next : IQBarButtonItem
+
+            if IQ_IS_IOS8_OR_GREATER {
+
+                // Get the top level "bundle" which may actually be the framework
+                var bundle = NSBundle(forClass: IQKeyboardManager.self)
+
+                if let resourcePath = bundle.pathForResource("IQKeyboardManager", ofType: "bundle") {
+                    if let resourcesBundle = NSBundle(path: resourcePath) {
+                        bundle = resourcesBundle;
+                    }
+                }
+
+                prev = IQBarButtonItem(image: UIImage(named: "IQButtonBarArrowLeft", inBundle: bundle, compatibleWithTraitCollection: nil), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+
+                next = IQBarButtonItem(image: UIImage(named: "IQButtonBarArrowRight", inBundle: bundle, compatibleWithTraitCollection: nil), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+            } else {
+                prev = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowLeft"), style: UIBarButtonItemStyle.Plain, target: target, action: previousAction)
+
+                next = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight"), style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
+            }
 
             let fixed = IQBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.FixedSpace, target: nil, action: nil)
             fixed.width = 23
 
-            let next = IQBarButtonItem(image: UIImage(named: "IQKeyboardManager.bundle/IQButtonBarArrowRight"), style: UIBarButtonItemStyle.Plain, target: target, action: nextAction)
-
             items.append(prev)
             items.append(fixed)
             items.append(next)