diff --git a/README.md b/README.md
index db7851b..1759a85 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,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
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
}
}