diff --git a/HorizontalPicker/Classes/CollectionView/HPCollectionVC.swift b/HorizontalPicker/Classes/CollectionView/HPCollectionVC.swift index 7f88e04..45cc155 100644 --- a/HorizontalPicker/Classes/CollectionView/HPCollectionVC.swift +++ b/HorizontalPicker/Classes/CollectionView/HPCollectionVC.swift @@ -93,7 +93,7 @@ class HPCollectionVC: UICollectionViewController, UICollectionViewDelegateFlowLa // MARK: - Helper func sizeForText(_ text: String, maxSize: CGSize) -> CGSize { - let attr: [NSAttributedStringKey: Any] = [.font : font] + let attr: [NSAttributedString.Key: Any] = [.font : font] var frame = (text as NSString).boundingRect(with: maxSize, options: .usesLineFragmentOrigin, attributes: attr, context: NSStringDrawingContext()) frame = frame.integral frame.size.width += 10 diff --git a/HorizontalPicker/Classes/HorizontalPickerView.swift b/HorizontalPicker/Classes/HorizontalPickerView.swift index 89f8337..cd910e7 100644 --- a/HorizontalPicker/Classes/HorizontalPickerView.swift +++ b/HorizontalPicker/Classes/HorizontalPickerView.swift @@ -141,7 +141,7 @@ public class HorizontalPickerView: UIView { private func adjust(with delegate: HorizontalPickerViewDelegate?, dataSource: HorizontalPickerViewDataSource?) { guard let delegate = delegate, let dataSource = dataSource, isInitialized == false else { return } - collectionController.font = delegate.textFontForHorizontalPickerView?(pickerView: self) ?? UIFont.preferredFont(forTextStyle: UIFontTextStyle.body) + collectionController.font = delegate.textFontForHorizontalPickerView?(pickerView: self) ?? UIFont.preferredFont(forTextStyle: UIFont.TextStyle.body) collectionController.textColor = delegate.textColorForHorizontalPickerView?(pickerView: self) ?? UIColor.lightGray collectionController.useTwoLineMode = delegate.useTwoLineModeForHorizontalPickerView?(pickerView: self) ?? false diff --git a/HorizontalPickerDemo.xcodeproj/project.pbxproj b/HorizontalPickerDemo.xcodeproj/project.pbxproj index 543414b..2d3d642 100644 --- a/HorizontalPickerDemo.xcodeproj/project.pbxproj +++ b/HorizontalPickerDemo.xcodeproj/project.pbxproj @@ -402,6 +402,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -671,6 +672,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -684,6 +686,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -695,6 +698,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemoTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HorizontalPickerDemo.app/HorizontalPickerDemo"; }; name = Debug; @@ -707,6 +711,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemoTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HorizontalPickerDemo.app/HorizontalPickerDemo"; }; name = Release; @@ -718,6 +723,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemoUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = HorizontalPickerDemo; USES_XCTRUNNER = YES; }; @@ -730,6 +736,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerDemoUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = HorizontalPickerDemo; USES_XCTRUNNER = YES; }; @@ -755,6 +762,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -779,6 +787,7 @@ PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPicker; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -792,6 +801,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HorizontalPickerDemo.app/HorizontalPickerDemo"; }; name = Debug; @@ -803,6 +813,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = de.berndrabe.HorizontalPickerTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HorizontalPickerDemo.app/HorizontalPickerDemo"; }; name = Release;