Skip to content
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

Jump to bottom

Fix/hex init #26

Merged
merged 3 commits into from
Aug 29, 2016
Merged

Fix/hex init #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81ea81f
Convert `.hex()` to `init(hex:)
Aug 29, 2016
c9de4b7
Pod update
Aug 29, 2016
3b80cae
Migrate examples to new version of Hue
Aug 29, 2016
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
56 changes: 29 additions & 27 deletions Example/Gradients/Gradients.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
3B0B630FF9E74EDC679D59AF /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA6288E56E8D691786FA2D88 /* Pods.framework */; };
9CA35711A22687097445773A /* Pods_Gradients.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB7F514B38C790EF45452227 /* Pods_Gradients.framework */; };
BDD79C131C33E3E3004828C1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD79C0C1C33E3E3004828C1 /* AppDelegate.swift */; };
BDD79C141C33E3E3004828C1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BDD79C0D1C33E3E3004828C1 /* Assets.xcassets */; };
BDD79C151C33E3E3004828C1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BDD79C0E1C33E3E3004828C1 /* LaunchScreen.storyboard */; };
Expand All @@ -18,8 +18,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
9EC638BABDD22702FC2CA5BA /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
A98837528CBB518D9D869F03 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
4F63E22D48084732C25112B7 /* Pods-Gradients.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gradients.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gradients/Pods-Gradients.release.xcconfig"; sourceTree = "<group>"; };
BB7F514B38C790EF45452227 /* Pods_Gradients.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Gradients.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDD79C0C1C33E3E3004828C1 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
BDD79C0D1C33E3E3004828C1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BDD79C0F1C33E3E3004828C1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -30,24 +30,35 @@
BDD79C1E1C33F642004828C1 /* Font.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
BDDDF1701C32B5930087F872 /* Gradients.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gradients.app; sourceTree = BUILT_PRODUCTS_DIR; };
CA6288E56E8D691786FA2D88 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E15E1F0C20EA3B194AA7BC08 /* Pods-Gradients.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gradients.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Gradients/Pods-Gradients.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
BDDDF16D1C32B5930087F872 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3B0B630FF9E74EDC679D59AF /* Pods.framework in Frameworks */,
9CA35711A22687097445773A /* Pods_Gradients.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
165CFEB136762DFF3FF22DD0 /* Pods */ = {
isa = PBXGroup;
children = (
E15E1F0C20EA3B194AA7BC08 /* Pods-Gradients.debug.xcconfig */,
4F63E22D48084732C25112B7 /* Pods-Gradients.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
1C267CDA71C06E96EF89E1D1 /* Frameworks */ = {
isa = PBXGroup;
children = (
CA6288E56E8D691786FA2D88 /* Pods.framework */,
BB7F514B38C790EF45452227 /* Pods_Gradients.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -80,8 +91,8 @@
children = (
BDD79C0B1C33E3E3004828C1 /* Gradients */,
BDDDF1711C32B5930087F872 /* Products */,
C41F313752B6F01D614EB5F8 /* Pods */,
1C267CDA71C06E96EF89E1D1 /* Frameworks */,
165CFEB136762DFF3FF22DD0 /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -93,28 +104,19 @@
name = Products;
sourceTree = "<group>";
};
C41F313752B6F01D614EB5F8 /* Pods */ = {
isa = PBXGroup;
children = (
A98837528CBB518D9D869F03 /* Pods.debug.xcconfig */,
9EC638BABDD22702FC2CA5BA /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
BDDDF16F1C32B5930087F872 /* Gradients */ = {
isa = PBXNativeTarget;
buildConfigurationList = BDDDF1821C32B5930087F872 /* Build configuration list for PBXNativeTarget "Gradients" */;
buildPhases = (
F4CA0BAB0AA23D40D700CC59 /* Check Pods Manifest.lock */,
E82B9BC35D0C7A652506E34B /* [CP] Check Pods Manifest.lock */,
BDDDF16C1C32B5930087F872 /* Sources */,
BDDDF16D1C32B5930087F872 /* Frameworks */,
BDDDF16E1C32B5930087F872 /* Resources */,
434F9D4713E48F75706D2D76 /* Embed Pods Frameworks */,
BEAC7D033C027EFCE5D6EF3C /* Copy Pods Resources */,
8A1E04B668EBCA504AF5ED73 /* [CP] Embed Pods Frameworks */,
DB64041712723E32081F3048 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -171,44 +173,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
434F9D4713E48F75706D2D76 /* Embed Pods Frameworks */ = {
8A1E04B668EBCA504AF5ED73 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Gradients/Pods-Gradients-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
BEAC7D033C027EFCE5D6EF3C /* Copy Pods Resources */ = {
DB64041712723E32081F3048 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Gradients/Pods-Gradients-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F4CA0BAB0AA23D40D700CC59 /* Check Pods Manifest.lock */ = {
E82B9BC35D0C7A652506E34B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -328,7 +330,7 @@
};
BDDDF1831C32B5930087F872 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A98837528CBB518D9D869F03 /* Pods.debug.xcconfig */;
baseConfigurationReference = E15E1F0C20EA3B194AA7BC08 /* Pods-Gradients.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/Gradients/Info.plist";
Expand All @@ -340,7 +342,7 @@
};
BDDDF1841C32B5930087F872 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9EC638BABDD22702FC2CA5BA /* Pods.release.xcconfig */;
baseConfigurationReference = 4F63E22D48084732C25112B7 /* Pods-Gradients.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = "$(SRCROOT)/Gradients/Info.plist";
Expand Down
2 changes: 1 addition & 1 deletion Example/Gradients/Gradients/Cells/GradientListCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class GradientListCell: ListSpotCell {
}()

override func configure(inout item: ViewModel) {
textLabel?.textColor = UIColor.hex("#fff").alpha(0.8)
textLabel?.textColor = UIColor(hex:"#fff").alpha(0.8)
textLabel?.text = item.title
textLabel?.font = Font.cell
selectedBackgroundView = selectedView
Expand Down
8 changes: 4 additions & 4 deletions Example/Gradients/Gradients/GradientsController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class GradientsController: SpotsController {
static let faker = Faker()

lazy var gradient: CAGradientLayer = [
UIColor.hex("#FD4340"),
UIColor.hex("#CE2BAE")
UIColor(hex:"#FD4340"),
UIColor(hex:"#CE2BAE")
].gradient { gradient in
gradient.speed = 0
gradient.timeOffset = 0
Expand All @@ -31,8 +31,8 @@ class GradientsController: SpotsController {

animation.fromValue = gradient.colors
animation.toValue = [
UIColor.hex("#8D24FF").CGColor,
UIColor.hex("#23A8F9").CGColor
UIColor(hex:"#8D24FF").CGColor,
UIColor(hex:"#23A8F9").CGColor
]
}

Expand Down
2 changes: 2 additions & 0 deletions Example/Gradients/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ platform :ios, '8.0'
use_frameworks!
inhibit_all_warnings!

target 'Gradients'

pod 'Hue', path: '../../'
pod 'Imaginary', git: 'https://github.com/hyperoslo/Imaginary'
pod 'Cache', git: 'https://github.com/hyperoslo/Cache'
Expand Down
8 changes: 5 additions & 3 deletions Example/Gradients/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PODS:
- Cache (1.0.0)
- Fakery (1.1.1):
- SwiftyJSON
- Hue (1.0.0)
- Hue (1.1.1)
- Imaginary (0.1.0):
- Cache
- Spots (1.0.0):
Expand Down Expand Up @@ -51,11 +51,13 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
Cache: 78f58bc008313c7a1182967a2ebcb3de9fddecd4
Fakery: a159ad2f48e01c5ae7059c201700b38fa0484707
Hue: 44ae8b1091935fcc75055174095ab04653989235
Hue: 931aeeadcb29ce5de5b97589aa936be4638a1501
Imaginary: feaea646440c68a9b6ed66a46597d548b9a44207
Spots: 0e2a783d37cf05ce0752e2ae4cd709de0112cb04
Sugar: 0dec8fa53840c88c01579e61bcff8edbe468cb41
SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
Tailor: 3ec670165a4a0b728c187313e85b433af457152c

COCOAPODS: 0.39.0
PODFILE CHECKSUM: bb3722b747ee2ca0f533f2edc06801a2315a6c96

COCOAPODS: 1.0.1
Loading