Skip to content

Commit a5498ae

Browse files
bcylinbcylin
committed
Drop the prefix from KeyboardDismissTextField
1 parent 15291b7 commit a5498ae

6 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎Example/ExampleViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import ICInputAccessory
3030
class ExampleViewController: UITableViewController {
3131

3232
private let types: [UIView.Type] = [
33-
ICKeyboardDismissTextField.self,
33+
KeyboardDismissTextField.self,
3434
TokenField.self,
3535
CustomizedTokenField.self
3636
]
@@ -72,7 +72,7 @@ class ExampleViewController: UITableViewController {
7272

7373
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
7474
switch types[section] {
75-
case is ICKeyboardDismissTextField.Type:
75+
case is KeyboardDismissTextField.Type:
7676
return "Dismiss Keyboard"
7777
case is TokenField.Type:
7878
return "Text Field with Tokens"
@@ -87,7 +87,7 @@ class ExampleViewController: UITableViewController {
8787
let cell = tableView.dequeueReusableCell(withIdentifier: String(describing: ExampleCell.self), for: indexPath)
8888

8989
switch types[indexPath.section] {
90-
case let type as ICKeyboardDismissTextField.Type:
90+
case let type as KeyboardDismissTextField.Type:
9191
let textField = type.init()
9292
textField.leftViewMode = .always
9393
textField.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 15, height: 15))

‎Example/Main.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1919
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2020
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
21-
<button key="tableFooterView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="N87-CU-PrP">
21+
<button key="tableFooterView" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="N87-CU-PrP">
2222
<rect key="frame" x="0.0" y="217.5" width="375" height="88"/>
2323
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
2424
<fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -37,7 +37,7 @@
3737
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
3838
<autoresizingMask key="autoresizingMask"/>
3939
<subviews>
40-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Storyboard ICKeyboardDismissTextField" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qdb-Ab-nYe" customClass="ICKeyboardDismissTextField" customModule="ICInputAccessory">
40+
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Storyboard KeyboardDismissTextField" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qdb-Ab-nYe" customClass="KeyboardDismissTextField" customModule="ICInputAccessory">
4141
<rect key="frame" x="26" y="12" width="323" height="20"/>
4242
<fontDescription key="fontDescription" type="system" pointSize="16"/>
4343
<textInputTraits key="textInputTraits"/>
@@ -64,7 +64,7 @@
6464
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
6565
<autoresizingMask key="autoresizingMask"/>
6666
<subviews>
67-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2dP-7v-mWC" customClass="TokenField" customModule="ICInputAccessory">
67+
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2dP-7v-mWC" customClass="TokenField" customModule="ICInputAccessory">
6868
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
6969
<color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
7070
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -105,7 +105,7 @@
105105
</connections>
106106
</tableViewController>
107107
<placeholder placeholderIdentifier="IBFirstResponder" id="4Lj-fL-J07" userLabel="First Responder" sceneMemberID="firstResponder"/>
108-
<view contentMode="scaleToFill" id="zaj-ho-SsM" customClass="ICKeyboardDismissAccessoryView" customModule="ICInputAccessory">
108+
<view contentMode="scaleToFill" id="zaj-ho-SsM" customClass="KeyboardDismissAccessoryView" customModule="ICInputAccessory">
109109
<rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
110110
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
111111
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

‎ICInputAccessory.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
B533768B1F4436D000230739 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B533768A1F4436D000230739 /* AppDelegate.swift */; };
1616
B53376921F4436D000230739 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B53376911F4436D000230739 /* Assets.xcassets */; };
1717
B53376951F4436D000230739 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B53376931F4436D000230739 /* LaunchScreen.storyboard */; };
18-
B53376AB1F4437D900230739 /* ICKeyboardDismissTextFieldUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376A91F4437D900230739 /* ICKeyboardDismissTextFieldUITests.swift */; };
18+
B53376AB1F4437D900230739 /* KeyboardDismissTextFieldUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376A91F4437D900230739 /* KeyboardDismissTextFieldUITests.swift */; };
1919
B53376AC1F4437D900230739 /* TokenFieldUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376AA1F4437D900230739 /* TokenFieldUITests.swift */; };
2020
B53376B31F44387000230739 /* CustomizedTokenField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376AD1F44387000230739 /* CustomizedTokenField.swift */; };
2121
B53376B41F44387000230739 /* CustomizedTokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376AE1F44387000230739 /* CustomizedTokenViewController.swift */; };
@@ -25,9 +25,9 @@
2525
B53376B81F44387000230739 /* StoryboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53376B21F44387000230739 /* StoryboardViewController.swift */; };
2626
B53376BB1F4438F400230739 /* ICInputAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56BC42A1C89A7EA00C20AD6 /* ICInputAccessory.framework */; };
2727
B548C5AD1C8D69A5009D5AEE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B548C5AC1C8D69A5009D5AEE /* Images.xcassets */; };
28-
B548C5EE1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */; };
28+
B548C5EE1C8EB9E2009D5AEE /* KeyboardDismissTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B548C5ED1C8EB9E2009D5AEE /* KeyboardDismissTextField.swift */; };
2929
B56BC42E1C89A7EA00C20AD6 /* ICInputAccessory.h in Headers */ = {isa = PBXBuildFile; fileRef = B56BC42D1C89A7EA00C20AD6 /* ICInputAccessory.h */; settings = {ATTRIBUTES = (Public, ); }; };
30-
B56BC4361C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */; };
30+
B56BC4361C89A8D800C20AD6 /* KeyboardDismissAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56BC4351C89A8D800C20AD6 /* KeyboardDismissAccessoryView.swift */; };
3131
B5E619CB1F44A05B005200E1 /* ICInputAccessory.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B56BC42A1C89A7EA00C20AD6 /* ICInputAccessory.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3232
/* End PBXBuildFile section */
3333

@@ -77,7 +77,7 @@
7777
B53376961F4436D000230739 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7878
B533769B1F4436D000230739 /* ICInputAccessoryUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ICInputAccessoryUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7979
B53376A11F4436D000230739 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ICInputAccessoryUITests/Info.plist; sourceTree = SOURCE_ROOT; };
80-
B53376A91F4437D900230739 /* ICKeyboardDismissTextFieldUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissTextFieldUITests.swift; path = ICInputAccessoryUITests/ICKeyboardDismissTextFieldUITests.swift; sourceTree = SOURCE_ROOT; };
80+
B53376A91F4437D900230739 /* KeyboardDismissTextFieldUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KeyboardDismissTextFieldUITests.swift; path = ICInputAccessoryUITests/KeyboardDismissTextFieldUITests.swift; sourceTree = SOURCE_ROOT; };
8181
B53376AA1F4437D900230739 /* TokenFieldUITests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TokenFieldUITests.swift; path = ICInputAccessoryUITests/TokenFieldUITests.swift; sourceTree = SOURCE_ROOT; };
8282
B53376AD1F44387000230739 /* CustomizedTokenField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomizedTokenField.swift; sourceTree = "<group>"; };
8383
B53376AE1F44387000230739 /* CustomizedTokenViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomizedTokenViewController.swift; sourceTree = "<group>"; };
@@ -86,11 +86,11 @@
8686
B53376B11F44387000230739 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
8787
B53376B21F44387000230739 /* StoryboardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardViewController.swift; sourceTree = "<group>"; };
8888
B548C5AC1C8D69A5009D5AEE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Source/KeyboardDismissTextField/Images.xcassets; sourceTree = SOURCE_ROOT; };
89-
B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissTextField.swift; path = Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift; sourceTree = SOURCE_ROOT; };
89+
B548C5ED1C8EB9E2009D5AEE /* KeyboardDismissTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KeyboardDismissTextField.swift; path = Source/KeyboardDismissTextField/KeyboardDismissTextField.swift; sourceTree = SOURCE_ROOT; };
9090
B56BC42A1C89A7EA00C20AD6 /* ICInputAccessory.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ICInputAccessory.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9191
B56BC42D1C89A7EA00C20AD6 /* ICInputAccessory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ICInputAccessory.h; sourceTree = "<group>"; };
9292
B56BC42F1C89A7EA00C20AD6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
93-
B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissAccessoryView.swift; path = Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift; sourceTree = SOURCE_ROOT; };
93+
B56BC4351C89A8D800C20AD6 /* KeyboardDismissAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KeyboardDismissAccessoryView.swift; path = Source/KeyboardDismissTextField/KeyboardDismissAccessoryView.swift; sourceTree = SOURCE_ROOT; };
9494
/* End PBXFileReference section */
9595

9696
/* Begin PBXFrameworksBuildPhase section */
@@ -128,13 +128,13 @@
128128
name = Frameworks;
129129
sourceTree = "<group>";
130130
};
131-
B52819671C90358C007D01D5 /* ICKeyboardDismissAccessory */ = {
131+
B52819671C90358C007D01D5 /* KeyboardDismissAccessory */ = {
132132
isa = PBXGroup;
133133
children = (
134-
B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */,
135-
B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */,
134+
B56BC4351C89A8D800C20AD6 /* KeyboardDismissAccessoryView.swift */,
135+
B548C5ED1C8EB9E2009D5AEE /* KeyboardDismissTextField.swift */,
136136
);
137-
name = ICKeyboardDismissAccessory;
137+
name = KeyboardDismissAccessory;
138138
sourceTree = "<group>";
139139
};
140140
B52819701C9035C3007D01D5 /* TokenField */ = {
@@ -168,8 +168,8 @@
168168
B533769E1F4436D000230739 /* ICInputAccessoryUITests */ = {
169169
isa = PBXGroup;
170170
children = (
171-
B53376A91F4437D900230739 /* ICKeyboardDismissTextFieldUITests.swift */,
172171
B53376A11F4436D000230739 /* Info.plist */,
172+
B53376A91F4437D900230739 /* KeyboardDismissTextFieldUITests.swift */,
173173
B53376AA1F4437D900230739 /* TokenFieldUITests.swift */,
174174
);
175175
name = ICInputAccessoryUITests;
@@ -201,7 +201,7 @@
201201
B56BC42C1C89A7EA00C20AD6 /* ICInputAccessory */ = {
202202
isa = PBXGroup;
203203
children = (
204-
B52819671C90358C007D01D5 /* ICKeyboardDismissAccessory */,
204+
B52819671C90358C007D01D5 /* KeyboardDismissAccessory */,
205205
B52819701C9035C3007D01D5 /* TokenField */,
206206
B56BC42D1C89A7EA00C20AD6 /* ICInputAccessory.h */,
207207
B548C5AC1C8D69A5009D5AEE /* Images.xcassets */,
@@ -418,7 +418,7 @@
418418
isa = PBXSourcesBuildPhase;
419419
buildActionMask = 2147483647;
420420
files = (
421-
B53376AB1F4437D900230739 /* ICKeyboardDismissTextFieldUITests.swift in Sources */,
421+
B53376AB1F4437D900230739 /* KeyboardDismissTextFieldUITests.swift in Sources */,
422422
B53376AC1F4437D900230739 /* TokenFieldUITests.swift in Sources */,
423423
);
424424
runOnlyForDeploymentPostprocessing = 0;
@@ -428,9 +428,9 @@
428428
buildActionMask = 2147483647;
429429
files = (
430430
B528196C1C9035BE007D01D5 /* BackspaceTextField.swift in Sources */,
431-
B56BC4361C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift in Sources */,
432-
B548C5EE1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift in Sources */,
433431
B528196D1C9035BE007D01D5 /* InsetLabel.swift in Sources */,
432+
B56BC4361C89A8D800C20AD6 /* KeyboardDismissAccessoryView.swift in Sources */,
433+
B548C5EE1C8EB9E2009D5AEE /* KeyboardDismissTextField.swift in Sources */,
434434
B528196E1C9035BE007D01D5 /* Token.swift in Sources */,
435435
B528196F1C9035BE007D01D5 /* TokenField.swift in Sources */,
436436
);

ICInputAccessoryUITests/ICKeyboardDismissTextFieldUITests.swift renamed to ICInputAccessoryUITests/KeyboardDismissTextFieldUITests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ICKeyboardDismissTextFieldUITests.swift
2+
// KeyboardDismissTextFieldUITests.swift
33
// ICInputAccessoryUITests
44
//
55
// Created by Ben on 20/03/2016.
@@ -26,7 +26,7 @@
2626

2727
import XCTest
2828

29-
class ICKeyboardDismissTextFieldUITests: XCTestCase {
29+
class KeyboardDismissTextFieldUITests: XCTestCase {
3030

3131
private lazy var app = XCUIApplication()
3232

@@ -37,13 +37,13 @@ class ICKeyboardDismissTextFieldUITests: XCTestCase {
3737
}
3838

3939
func testKeyboardDismissing() {
40-
app.tables.textFields["ICKeyboardDismissTextField"].tap()
40+
app.tables.textFields["KeyboardDismissTextField"].tap()
4141
app.buttons["Dismiss Keyboard"].tap()
4242
}
4343

4444
func testStoryboard() {
4545
app.tables.buttons["Storyboard"].tap()
46-
app.tables.textFields["Storyboard ICKeyboardDismissTextField"].tap()
46+
app.tables.textFields["Storyboard KeyboardDismissTextField"].tap()
4747
app.buttons["Dismiss Keyboard"].tap()
4848
app.tables.buttons["Back to Code"].tap()
4949
}

Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift renamed to Source/KeyboardDismissTextField/KeyboardDismissAccessoryView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ICKeyboardDismissAccessoryView.swift
2+
// KeyboardDismissAccessoryView.swift
33
// iCook
44
//
55
// Created by Ben on 27/08/2015.
@@ -28,7 +28,7 @@ import UIKit
2828

2929
/// A customized keyboard accessory view with a dismiss button.
3030
@IBDesignable
31-
open class ICKeyboardDismissAccessoryView: UIView {
31+
open class KeyboardDismissAccessoryView: UIView {
3232

3333
/// The background color of the button to dismiss keyboard.
3434
@IBInspectable public var buttonColor: UIColor = Constants.ButtonColor {

Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift renamed to Source/KeyboardDismissTextField/KeyboardDismissTextField.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ICKeyboardDismissTextField.swift
2+
// KeyboardDismissTextField.swift
33
// ICInputAccessory
44
//
55
// Created by Ben on 07/03/2016.
@@ -28,10 +28,10 @@ import UIKit
2828

2929
/// A text field that has a button to dismiss keyboard on the input accessory view.
3030
@IBDesignable
31-
open class ICKeyboardDismissTextField: UITextField {
31+
open class KeyboardDismissTextField: UITextField {
3232

3333
/// The custom input accessory view with a button to dismiss keyboard.
34-
@IBOutlet public var keyboardAccessoryView: ICKeyboardDismissAccessoryView! {
34+
@IBOutlet public var keyboardAccessoryView: KeyboardDismissAccessoryView! {
3535
didSet {
3636
if UI_USER_INTERFACE_IDIOM() != .phone { return }
3737
keyboardAccessoryView.dismissButton.addTarget(self, action: .dismiss, for: .touchUpInside)
@@ -75,7 +75,7 @@ open class ICKeyboardDismissTextField: UITextField {
7575
if keyboardAccessoryView == nil {
7676
// Set an initial frame for the button to appear during UI testing.
7777
let frame = CGRect(x: 0, y: 0, width: 320, height: 60)
78-
keyboardAccessoryView = ICKeyboardDismissAccessoryView(frame: frame)
78+
keyboardAccessoryView = KeyboardDismissAccessoryView(frame: frame)
7979
}
8080
}
8181

@@ -86,5 +86,5 @@ open class ICKeyboardDismissTextField: UITextField {
8686

8787

8888
private extension Selector {
89-
static let dismiss = #selector(ICKeyboardDismissTextField.dismiss(_:))
89+
static let dismiss = #selector(KeyboardDismissTextField.dismiss(_:))
9090
}

0 commit comments

Comments
 (0)