Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 0710af2

Browse files
committed
Split out UIKit color resource
1 parent ffe58d3 commit 0710af2

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

Diff for: Library/Core/ColorResource.swift

+1-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2016 Mathijs Kadijk. All rights reserved.
77
//
88

9-
import UIKit
9+
import Foundation
1010

1111
public protocol ColorResourceType {
1212

@@ -26,17 +26,6 @@ public protocol ColorResourceType {
2626
var alpha: CGFloat { get }
2727
}
2828

29-
public extension ColorResourceType {
30-
/**
31-
Returns the a UIColor
32-
33-
- returns: A UIColor for this color resource
34-
*/
35-
func color() -> UIColor {
36-
return UIColor(red: red, green: green, blue: blue, alpha: alpha)
37-
}
38-
}
39-
4029
public struct ColorResource: ColorResourceType {
4130

4231
/// Name of the color

Diff for: Library/UIKit/ColorResource+UIKit.swift

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// ColorResource+UIKit.swift
3+
// R.swift.Library
4+
//
5+
// Created by Tom Lokhorst on 2016-04-23.
6+
// Copyright © 2016 Mathijs Kadijk. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
public extension ColorResourceType {
12+
/**
13+
Returns the a UIColor
14+
15+
- returns: A UIColor for this color resource
16+
*/
17+
func color() -> UIColor {
18+
return UIColor(red: red, green: green, blue: blue, alpha: alpha)
19+
}
20+
}

Diff for: R.swift.Library.xcodeproj/project.pbxproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
E20F34A71C92B44100338F81 /* NSData+FileResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E20F34A61C92B44100338F81 /* NSData+FileResource.swift */; };
6464
E22D43671C95EEA100692FFF /* ColorResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22D43661C95EEA100692FFF /* ColorResource.swift */; };
6565
E24720CA1C96B4D100DF291D /* ColorResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22D43661C95EEA100692FFF /* ColorResource.swift */; };
66+
E250BE941CCBCEB100CC71DE /* ColorResource+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */; };
67+
E250BE951CCBF58200CC71DE /* ColorResource+UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */; };
6668
/* End PBXBuildFile section */
6769

6870
/* Begin PBXContainerItemProxy section */
@@ -116,6 +118,7 @@
116118
D5E435AC1C3D00770091090C /* FileResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileResource.swift; sourceTree = "<group>"; };
117119
E20F34A61C92B44100338F81 /* NSData+FileResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+FileResource.swift"; sourceTree = "<group>"; };
118120
E22D43661C95EEA100692FFF /* ColorResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorResource.swift; sourceTree = "<group>"; };
121+
E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ColorResource+UIKit.swift"; sourceTree = "<group>"; };
119122
/* End PBXFileReference section */
120123

121124
/* Begin PBXFrameworksBuildPhase section */
@@ -155,6 +158,7 @@
155158
D543F9C21C14987000D16A0C /* UIKit */ = {
156159
isa = PBXGroup;
157160
children = (
161+
E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */,
158162
D5E435A81C3CFB460091090C /* NibResource+UIKit.swift */,
159163
D57E1EB81C3E4C1A00DDA68F /* StoryboardResourceWithInitialController+UIKit.swift */,
160164
D543F9CE1C149C0A00D16A0C /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift */,
@@ -163,10 +167,10 @@
163167
D553F5861C44170E00885232 /* UIImage+ImageResource.swift */,
164168
D5588CAA1C3F9DBE00912F97 /* UINib+NibResource.swift */,
165169
D57E1EBA1C3E4C4300DDA68F /* UIStoryboard+StoryboardResource.swift */,
170+
D51335281C95A79B0014C9D4 /* UIStoryboard+StoryboardViewControllerResource.swift */,
166171
D543F9C31C1498FB00D16A0C /* UITableView+ReuseIdentifierProtocol.swift */,
167172
D543F9C71C14995800D16A0C /* UIViewController+NibResource.swift */,
168173
D543F9C91C14998800D16A0C /* UIViewController+StoryboardSegueIdentifierProtocol.swift */,
169-
D51335281C95A79B0014C9D4 /* UIStoryboard+StoryboardViewControllerResource.swift */,
170174
);
171175
path = UIKit;
172176
sourceTree = "<group>";
@@ -435,6 +439,7 @@
435439
806E69B01C42BDDA00DE3A8B /* Validatable.swift in Sources */,
436440
806E69B31C42BDE000DE3A8B /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift in Sources */,
437441
D5728B321C4D541500E38168 /* NSBundle+FileResource.swift in Sources */,
442+
E250BE951CCBF58200CC71DE /* ColorResource+UIKit.swift in Sources */,
438443
806E69B91C42BDE000DE3A8B /* UITableView+ReuseIdentifierProtocol.swift in Sources */,
439444
806E69AE1C42BDDA00DE3A8B /* StoryboardResource.swift in Sources */,
440445
806E69A91C42BDDA00DE3A8B /* FileResource.swift in Sources */,
@@ -475,6 +480,7 @@
475480
D543F9C81C14995800D16A0C /* UIViewController+NibResource.swift in Sources */,
476481
D5E435A91C3CFB460091090C /* NibResource+UIKit.swift in Sources */,
477482
D543F9CF1C149C0A00D16A0C /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift in Sources */,
483+
E250BE941CCBCEB100CC71DE /* ColorResource+UIKit.swift in Sources */,
478484
D543F9C41C1498FB00D16A0C /* UITableView+ReuseIdentifierProtocol.swift in Sources */,
479485
D56DC7731C42B65C00623437 /* NSBundle+FileResource.swift in Sources */,
480486
D53F19241C229D7200AE2FAD /* Validatable.swift in Sources */,

0 commit comments

Comments
 (0)