Skip to content

Commit c6f6304

Browse files
hackiftekharhackiftekhar
authored
Merge pull request #2086 from hackiftekhar/direct_dependency_to_libraries
Direct dependency to libraries
2 parents bb17076 + 887cc48 commit c6f6304

38 files changed

Lines changed: 124 additions & 3253 deletions

‎Cartfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
github "hackiftekhar/IQKeyboardNotification"
2-
github "hackiftekhar/IQTextInputViewNotification"
2+
github "hackiftekhar/IQTextInputViewNotification"
3+
github "hackiftekhar/IQKeyboardToolbarManager"
4+
github "hackiftekhar/IQTextView"

‎Cartfile.resolved‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
github "hackiftekhar/IQKeyboardCore" "1.0.6"
2-
github "hackiftekhar/IQKeyboardNotification" "1.0.4"
3-
github "hackiftekhar/IQTextInputViewNotification" "1.0.6"
1+
github "hackiftekhar/IQKeyboardCore" "1.0.7"
2+
github "hackiftekhar/IQKeyboardNotification" "1.0.5"
3+
github "hackiftekhar/IQKeyboardToolbar" "1.1.1"
4+
github "hackiftekhar/IQKeyboardToolbarManager" "1.1.1"
5+
github "hackiftekhar/IQTextInputViewNotification" "1.0.8"
6+
github "hackiftekhar/IQTextView" "1.0.5"

‎Demo.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 176 deletions
Large diffs are not rendered by default.

‎Demo/Objective_C_Demo/Storyboard/Base.lproj/General.storyboard‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>

‎Demo/Swift_Demo/AppDelegate.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3535

3636
window?.backgroundColor = UIColor.white
3737
IQKeyboardManager.shared.enable = true
38+
IQKeyboardManager.shared.enableAutoToolbar = true
3839
return true
3940
}
4041

‎Demo/Swift_Demo/Storyboard/Base.lproj/General.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<scene sceneID="kAr-5b-4Sn">
1515
<objects>
1616
<viewController storyboardIdentifier="TextFieldViewController" id="csO-qF-Ohn" customClass="TextFieldViewController" customModule="DemoSwift" customModuleProvider="target" sceneMemberID="viewController">
17-
<view key="view" contentMode="scaleToFill" id="i84-jm-CzI" customClass="IQDeepResponderContainerView" customModule="IQKeyboardManagerSwift">
17+
<view key="view" contentMode="scaleToFill" id="i84-jm-CzI" customClass="IQDeepResponderContainerView" customModule="IQKeyboardToolbarManager">
1818
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
1919
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2020
<subviews>
@@ -113,7 +113,7 @@
113113
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
114114
<nil key="highlightedColor"/>
115115
</label>
116-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" tag="101" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Nry-4j-VcI" customClass="IQTextView" customModule="IQKeyboardManagerSwift">
116+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" tag="101" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Nry-4j-VcI" customClass="IQTextView" customModule="IQTextView">
117117
<rect key="frame" x="20" y="28" width="335" height="35"/>
118118
<color key="backgroundColor" name="EBEDF0"/>
119119
<color key="tintColor" red="0.47692340353260865" green="0.013985326711680755" blue="0.039278733763664801" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -163,7 +163,7 @@
163163
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="63Q-wt-23t">
164164
<rect key="frame" x="0.0" y="596" width="375" height="91"/>
165165
<subviews>
166-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" tag="108" contentMode="scaleToFill" text="Can resign on touching outside" translatesAutoresizingMaskIntoConstraints="NO" id="wIC-LZ-asw" customClass="IQTextView" customModule="IQKeyboardManagerSwift">
166+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" tag="108" contentMode="scaleToFill" text="Can resign on touching outside" translatesAutoresizingMaskIntoConstraints="NO" id="wIC-LZ-asw" customClass="IQTextView" customModule="IQTextView">
167167
<rect key="frame" x="20" y="28" width="335" height="35"/>
168168
<color key="backgroundColor" name="EBEDF0"/>
169169
<color key="tintColor" red="0.2440839877768155" green="0.0" blue="0.47692340353260865" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -646,7 +646,7 @@
646646
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
647647
</systemColor>
648648
<systemColor name="systemGrayColor">
649-
<color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
649+
<color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
650650
</systemColor>
651651
</resources>
652652
</document>

‎Demo/Swift_Demo/Storyboard/Base.lproj/SpecialCase.storyboard‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
330330
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
331331
<subviews>
332-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uLB-dv-85O" customClass="IQDeepResponderContainerView" customModule="IQKeyboardManagerSwift">
332+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uLB-dv-85O" customClass="IQDeepResponderContainerView" customModule="IQKeyboardToolbarManager">
333333
<rect key="frame" x="10" y="88" width="394" height="764"/>
334334
<subviews>
335335
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oad-Sj-fOj">
@@ -1091,19 +1091,19 @@
10911091
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
10921092
</systemColor>
10931093
<systemColor name="separatorColor">
1094-
<color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
1094+
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
10951095
</systemColor>
10961096
<systemColor name="systemBackgroundColor">
10971097
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
10981098
</systemColor>
10991099
<systemColor name="systemBlueColor">
1100-
<color red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1100+
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
11011101
</systemColor>
11021102
<systemColor name="systemGray5Color">
1103-
<color red="0.8980392157" green="0.8980392157" blue="0.91764705879999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1103+
<color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
11041104
</systemColor>
11051105
<systemColor name="systemGrayColor">
1106-
<color red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1106+
<color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
11071107
</systemColor>
11081108
</resources>
11091109
</document>

‎Demo/Swift_Demo/ViewController/CustomViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import UIKit
2525
import IQKeyboardManagerSwift
26+
import IQKeyboardToolbarManager
2627

2728
class CustomViewController: BaseViewController {
2829

‎Demo/Swift_Demo/ViewController/SettingsViewController.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import UIKit
2525
import IQKeyboardManagerSwift
26+
import IQKeyboardToolbar
27+
import IQKeyboardToolbarManager
2628

2729
class SettingsViewController: UITableViewController {
2830

@@ -280,7 +282,7 @@ extension SettingsViewController: OptionsViewControllerDelegate {
280282
}
281283

282284
if selectedIndexPath.section == 1 && selectedIndexPath.row == 1 {
283-
let value = IQAutoToolbarManageBehavior(rawValue: index)!
285+
let value = IQKeyboardToolbarManageBehavior(rawValue: index)!
284286
IQKeyboardManager.shared.toolbarConfiguration.manageBehavior = value
285287
} else if selectedIndexPath.section == 1 && selectedIndexPath.row == 4 {
286288

‎Demo/Swift_Demo/ViewController/TextFieldViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import UIKit
2525
import IQKeyboardManagerSwift
2626
import IQDropDownTextFieldSwift
27+
import IQTextView
2728

2829
class TextFieldViewController: BaseViewController, UITextViewDelegate {
2930

0 commit comments

Comments
 (0)