From bfa17ab3135889eafa54eb61f80e20279b3daa1d Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Tue, 9 May 2017 18:54:23 +0800 Subject: [PATCH 1/2] Fixed the interface builder compilation error --- ScrollPager/Source/ScrollPager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScrollPager/Source/ScrollPager.swift b/ScrollPager/Source/ScrollPager.swift index 8bde2a3..b34d0d3 100644 --- a/ScrollPager/Source/ScrollPager.swift +++ b/ScrollPager/Source/ScrollPager.swift @@ -105,7 +105,7 @@ import UIKit private func initialize() { #if TARGET_INTERFACE_BUILDER - addSegmentsWithTitles(["One", "Two", "Three", "Four"]) + addSegmentsWithTitles(segmentTitles: ["One", "Two", "Three", "Four"]) #endif } From 9e20fc81334e1f025c33a55fa1bba46dc44f64e2 Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Wed, 26 Feb 2020 23:46:22 +0800 Subject: [PATCH 2/2] swift 5.0 --- .swift-version | 1 - ScrollPager.podspec | 5 +++-- ScrollPager.xcodeproj/project.pbxproj | 9 +++++---- ScrollPager/Source/ScrollPager.swift | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 9f55b2c..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -3.0 diff --git a/ScrollPager.podspec b/ScrollPager.podspec index 0cb08ad..16f42af 100644 --- a/ScrollPager.podspec +++ b/ScrollPager.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ScrollPager' - s.version = '0.9' + s.version = '1.0.0' s.summary = 'A fully featured scroll pager similar to the one in flipboard, fully configurable through storyboard' s.homepage = 'https://github.com/aryaxt/ScrollPager' s.license = { @@ -8,7 +8,8 @@ Pod::Spec.new do |s| :file => 'License.txt' } s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/ScrollPager'} - s.source = {:git => 'https://github.com/aryaxt/ScrollPager.git', :tag => '0.9'} + s.source = {:git => 'https://github.com/eddy-lau/ScrollPager.git', :tag => '1.0.0'} + s.swift_version = '5.0' s.platform = :ios, '8.0' s.source_files = 'ScrollPager/Source/*.{swift}' s.framework = 'Foundation', 'UIKit' diff --git a/ScrollPager.xcodeproj/project.pbxproj b/ScrollPager.xcodeproj/project.pbxproj index 384c7f3..27ed950 100644 --- a/ScrollPager.xcodeproj/project.pbxproj +++ b/ScrollPager.xcodeproj/project.pbxproj @@ -189,6 +189,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -368,7 +369,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -381,7 +382,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -401,7 +402,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ScrollPager.app/ScrollPager"; }; name = Debug; @@ -418,7 +419,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ScrollPager.app/ScrollPager"; }; name = Release; diff --git a/ScrollPager/Source/ScrollPager.swift b/ScrollPager/Source/ScrollPager.swift index b34d0d3..c58855c 100644 --- a/ScrollPager/Source/ScrollPager.swift +++ b/ScrollPager/Source/ScrollPager.swift @@ -213,7 +213,7 @@ import UIKit if strongSelf.indicatorSizeMatchesTitle { guard let string = button.titleLabel?.text else { fatalError("missing title on button, title is required for width calculation") } guard let font = button.titleLabel?.font else { fatalError("missing dont on button, title is required for width calculation") } - let size = string.size(attributes: [NSFontAttributeName: font]) + let size = string.size(withAttributes: [.font: font]) let x = width * CGFloat(index) + ((width - size.width) / CGFloat(2)) strongSelf.indicatorView.frame = CGRect(x: x, y: indicatorY, width: size.width, height: strongSelf.indicatorHeight) } @@ -266,7 +266,7 @@ import UIKit } } - internal func buttonSelected(sender: UIButton) { + @objc internal func buttonSelected(sender: UIButton) { if sender.tag == selectedIndex { return }