Skip to content

Support for Swift4 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zungjam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for Swift4 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions UsefulPickerVIew.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@
};
4B0BCC101CCE6A1B0000FE60 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0810;
LastSwiftMigration = 0910;
TestTargetID = 4B0BCBFC1CCE6A1B0000FE60;
};
4B0BCC1B1CCE6A1B0000FE60 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0810;
LastSwiftMigration = 0910;
TestTargetID = 4B0BCBFC1CCE6A1B0000FE60;
};
};
Expand Down Expand Up @@ -476,7 +476,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIew;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -489,7 +489,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIew;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -501,7 +501,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIewTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UsefulPickerVIew.app/UsefulPickerVIew";
};
name = Debug;
Expand All @@ -514,7 +515,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIewTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UsefulPickerVIew.app/UsefulPickerVIew";
};
name = Release;
Expand All @@ -526,7 +528,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIewUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = UsefulPickerVIew;
};
name = Debug;
Expand All @@ -538,7 +541,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ZeroJ.UsefulPickerVIewUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = UsefulPickerVIew;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion UsefulPickerView/Source/PickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ open class PickerView: UIView {
addSubview(pickerView)
}
}
func dateDidChange(_ datePic: UIDatePicker) {
@objc func dateDidChange(_ datePic: UIDatePicker) {
selectedDate = datePic.date
}

Expand Down
2 changes: 1 addition & 1 deletion UsefulPickerView/Source/SelectionTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ open class SelectionTextField: UITextField {
}

// MARK: - 监听通知
extension SelectionTextField {
@objc extension SelectionTextField {

fileprivate func commonInit() {
NotificationCenter.default.addObserver(self, selector: #selector(self.didBeginEdit), name: NSNotification.Name.UITextFieldTextDidBeginEditing, object: self)
Expand Down
18 changes: 10 additions & 8 deletions UsefulPickerView/Source/ToolBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,6 @@ open class ToolBarView: UIView {
cancleBtn.addTarget(self, action: #selector(self.cancelBtnOnClick(_:)), for: .touchUpInside)
}

func doneBtnOnClick(_ sender: UIButton) {
doneAction?()
}
func cancelBtnOnClick(_ sender: UIButton) {
cancelAction?()

}

override open func layoutSubviews() {
super.layoutSubviews()
let margin = 15.0
Expand All @@ -120,3 +112,13 @@ open class ToolBarView: UIView {


}

@objc extension ToolBarView {
func doneBtnOnClick(_ sender: UIButton) {
doneAction?()
}
func cancelBtnOnClick(_ sender: UIButton) {
cancelAction?()

}
}
2 changes: 1 addition & 1 deletion UsefulPickerView/Source/UsefulPickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ open class UsefulPickerView: UIView {
}

// MARK:- selector
extension UsefulPickerView {
@objc extension UsefulPickerView {

fileprivate func addOrentationObserver() {
NotificationCenter.default.addObserver(self, selector: #selector(self.statusBarOrientationChange), name: NSNotification.Name.UIApplicationDidChangeStatusBarOrientation, object: nil)
Expand Down