From 672dbd605b35507de2ed77f74b028395e5bc6131 Mon Sep 17 00:00:00 2001 From: Jakub Mazur Date: Wed, 22 Mar 2017 14:20:46 +0100 Subject: [PATCH 1/3] add Carhage support --- README.md | 6 ++ TGPControls.xcodeproj/project.pbxproj | 5 +- .../xcschemes/TGPControls.xcscheme | 80 +++++++++++++++++++ TGPControls/Info.plist | 2 +- 4 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 TGPControls.xcodeproj/xcshareddata/xcschemes/TGPControls.xcscheme diff --git a/README.md b/README.md index 43f4d52..945dd63 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ Using [CocoaPods](http://cocoapods.org/?q=TGPControls) - **iOS 10 and later down to iOS 8**: install CocoaPods 1.2.0+ [CocoaPods-Frameworks](http://blog.cocoapods.org/Pod-Authors-Guide-to-CocoaPods-Frameworks/), add `use_frameworks!` to your podfile. - **iOS 7**: Use TGPControls version 2.1.0 +Using [Carthage](https://github.com/Carthage/Carthage) +``` +github "SwiftArchitect/TGPControls" +``` +Please note that Carthage is available only for **iOS 8 or higher** + Besides customization, which you can do entirely under Interface Builder in iOS 8 and later, both `TGPDiscreteSlider` and `TGPCamelLabels` require surprisingly little code to integrate. ### DiscreteSlider diff --git a/TGPControls.xcodeproj/project.pbxproj b/TGPControls.xcodeproj/project.pbxproj index 3656d1d..76d8525 100644 --- a/TGPControls.xcodeproj/project.pbxproj +++ b/TGPControls.xcodeproj/project.pbxproj @@ -104,7 +104,6 @@ TargetAttributes = { DC56BDFC1E46EA2000AAD0D9 = { CreatedOnToolsVersion = 8.2.1; - DevelopmentTeam = 55K7THBUV8; LastSwiftMigration = 0820; ProvisioningStyle = Automatic; }; @@ -256,7 +255,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 55K7THBUV8; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -278,7 +277,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 55K7THBUV8; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; diff --git a/TGPControls.xcodeproj/xcshareddata/xcschemes/TGPControls.xcscheme b/TGPControls.xcodeproj/xcshareddata/xcschemes/TGPControls.xcscheme new file mode 100644 index 0000000..c41d331 --- /dev/null +++ b/TGPControls.xcodeproj/xcshareddata/xcschemes/TGPControls.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TGPControls/Info.plist b/TGPControls/Info.plist index 1c6f0bd..d5752d7 100644 --- a/TGPControls/Info.plist +++ b/TGPControls/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0 + 3.0.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass From 4fe0041d8168e9b934b178c7c6d61e22f29440b3 Mon Sep 17 00:00:00 2001 From: Jakub Mazur Date: Thu, 23 Mar 2017 10:27:34 +0100 Subject: [PATCH 2/3] change string image to UIImage object --- TGPControls/TGPDiscreteSlider.swift | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/TGPControls/TGPDiscreteSlider.swift b/TGPControls/TGPDiscreteSlider.swift index f0f0a20..a7ce8b2 100644 --- a/TGPControls/TGPDiscreteSlider.swift +++ b/TGPControls/TGPDiscreteSlider.swift @@ -71,7 +71,7 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { } } - @IBInspectable public var tickImage:String? = nil { + @IBInspectable public var tickImage:UIImage? = nil { didSet { layoutTrack() } @@ -90,7 +90,7 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { } } - @IBInspectable public var trackImage:String? = nil { + @IBInspectable public var trackImage:UIImage? = nil { didSet { layoutTrack() } @@ -339,8 +339,7 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { case .image: // Draw image if exists - if let tickImage = tickImage, - let image = UIImage(named: tickImage), + if let image = tickImage, let cgImage = image.cgImage, let ctx = UIGraphicsGetCurrentContext() { let centered = CGRect(x: rectangle.origin.x + (rectangle.width/2) - (image.size.width/2), @@ -392,8 +391,7 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { trackLayer.frame = CGRect.zero // Draw image if exists - if let trackImage = trackImage, - let image = UIImage(named: trackImage), + if let image = trackImage, let cgImage = image.cgImage, let ctx = UIGraphicsGetCurrentContext() { let centered = CGRect(x: (frame.width/2) - (image.size.width/2), @@ -531,8 +529,7 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { var trackSize = CGSize(width: frame.width - thumbWidth, height: trackHeight) if(.image == trackComponentStyle) { - if let trackImage = trackImage, - let image = UIImage(named: trackImage) { + if let image = trackImage { trackSize.width = image.size.width - thumbWidth } } From 7cc0a2cb191e1337b34e82078348fbd97b62ffa4 Mon Sep 17 00:00:00 2001 From: Xavier Schott Date: Fri, 14 Apr 2017 17:53:02 -0700 Subject: [PATCH 3/3] UIImage generalization --- TGPControls/TGPDiscreteSlider.swift | 16 ++++++---------- .../TGPControlsDemo/Base.lproj/Main.storyboard | 13 +++++++++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/TGPControls/TGPDiscreteSlider.swift b/TGPControls/TGPDiscreteSlider.swift index a7ce8b2..32b13c1 100644 --- a/TGPControls/TGPDiscreteSlider.swift +++ b/TGPControls/TGPDiscreteSlider.swift @@ -128,18 +128,15 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { } } - @IBInspectable public var thumbImage:String? = nil { + @IBInspectable public var thumbImage:UIImage? = nil { didSet { - // Associate image to layer NSBundle.bundleForClass(class) - if let imageName = thumbImage, - let image = UIImage(named: imageName) { - thumbLayer.contents = image.cgImage + if let thumbImage = thumbImage { + thumbLayer.contents = thumbImage.cgImage } - layoutTrack() } } - + @IBInspectable public var thumbShadowRadius:CGFloat = 0 { didSet { layoutTrack() @@ -590,9 +587,8 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { + (iOSThumbShadowOffset.height * 2)) case .image: - if let thumbImage = thumbImage, - let image = UIImage(named: thumbImage) { - return image.size + if let thumbImage = thumbImage { + return thumbImage.size } fallthrough diff --git a/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard b/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard index 95456c8..e1ad42a 100755 --- a/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard +++ b/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard @@ -134,9 +134,9 @@ - - - + + + @@ -374,7 +374,7 @@ - + @@ -501,4 +501,9 @@ + + + + +