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

Commit 440db52

Browse files
committed
Merge pull request #7 from mac-cain13/feature/strings
String resource
2 parents d8d5f04 + f420831 commit 440db52

File tree

4 files changed

+73
-13
lines changed

4 files changed

+73
-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/Core/StringResource.swift

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//
2+
// StringResource.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 Foundation
10+
11+
public protocol StringResourceType {
12+
13+
/// Key for the string
14+
var key: String { get }
15+
16+
/// File in containing the string
17+
var tableName: String { get }
18+
19+
/// Locales of the a localizable string
20+
var locales: [String] { get }
21+
}
22+
23+
public struct StringResource: StringResourceType {
24+
25+
/// Key for the string
26+
public let key: String
27+
28+
/// File in containing the string
29+
public let tableName: String
30+
31+
/// Locales of the a localizable string
32+
public let locales: [String]
33+
34+
public init(key: String, tableName: String, locales: [String]) {
35+
self.key = key
36+
self.tableName = tableName
37+
self.locales = locales
38+
}
39+
}

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

+13-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
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 */; };
68+
E250BE971CCBF60300CC71DE /* StringResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E250BE961CCBF60300CC71DE /* StringResource.swift */; };
69+
E250BE991CCBF7E900CC71DE /* StringResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = E250BE961CCBF60300CC71DE /* StringResource.swift */; };
6670
/* End PBXBuildFile section */
6771

6872
/* Begin PBXContainerItemProxy section */
@@ -116,6 +120,8 @@
116120
D5E435AC1C3D00770091090C /* FileResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileResource.swift; sourceTree = "<group>"; };
117121
E20F34A61C92B44100338F81 /* NSData+FileResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSData+FileResource.swift"; sourceTree = "<group>"; };
118122
E22D43661C95EEA100692FFF /* ColorResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorResource.swift; sourceTree = "<group>"; };
123+
E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ColorResource+UIKit.swift"; sourceTree = "<group>"; };
124+
E250BE961CCBF60300CC71DE /* StringResource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringResource.swift; sourceTree = "<group>"; };
119125
/* End PBXFileReference section */
120126

121127
/* Begin PBXFrameworksBuildPhase section */
@@ -155,6 +161,7 @@
155161
D543F9C21C14987000D16A0C /* UIKit */ = {
156162
isa = PBXGroup;
157163
children = (
164+
E250BE931CCBCEB100CC71DE /* ColorResource+UIKit.swift */,
158165
D5E435A81C3CFB460091090C /* NibResource+UIKit.swift */,
159166
D57E1EB81C3E4C1A00DDA68F /* StoryboardResourceWithInitialController+UIKit.swift */,
160167
D543F9CE1C149C0A00D16A0C /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift */,
@@ -163,10 +170,10 @@
163170
D553F5861C44170E00885232 /* UIImage+ImageResource.swift */,
164171
D5588CAA1C3F9DBE00912F97 /* UINib+NibResource.swift */,
165172
D57E1EBA1C3E4C4300DDA68F /* UIStoryboard+StoryboardResource.swift */,
173+
D51335281C95A79B0014C9D4 /* UIStoryboard+StoryboardViewControllerResource.swift */,
166174
D543F9C31C1498FB00D16A0C /* UITableView+ReuseIdentifierProtocol.swift */,
167175
D543F9C71C14995800D16A0C /* UIViewController+NibResource.swift */,
168176
D543F9C91C14998800D16A0C /* UIViewController+StoryboardSegueIdentifierProtocol.swift */,
169-
D51335281C95A79B0014C9D4 /* UIStoryboard+StoryboardViewControllerResource.swift */,
170177
);
171178
path = UIKit;
172179
sourceTree = "<group>";
@@ -184,6 +191,7 @@
184191
D57E1EB61C3E482A00DDA68F /* StoryboardResource.swift */,
185192
D543F9BE1C14983100D16A0C /* StoryboardSegueIdentifierProtocol.swift */,
186193
D51335261C959DF20014C9D4 /* StoryboardViewControllerResource.swift */,
194+
E250BE961CCBF60300CC71DE /* StringResource.swift */,
187195
D53F19231C229D7200AE2FAD /* Validatable.swift */,
188196
);
189197
path = Core;
@@ -434,7 +442,9 @@
434442
806E69AB1C42BDDA00DE3A8B /* Identifier.swift in Sources */,
435443
806E69B01C42BDDA00DE3A8B /* Validatable.swift in Sources */,
436444
806E69B31C42BDE000DE3A8B /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift in Sources */,
445+
E250BE991CCBF7E900CC71DE /* StringResource.swift in Sources */,
437446
D5728B321C4D541500E38168 /* NSBundle+FileResource.swift in Sources */,
447+
E250BE951CCBF58200CC71DE /* ColorResource+UIKit.swift in Sources */,
438448
806E69B91C42BDE000DE3A8B /* UITableView+ReuseIdentifierProtocol.swift in Sources */,
439449
806E69AE1C42BDDA00DE3A8B /* StoryboardResource.swift in Sources */,
440450
806E69A91C42BDDA00DE3A8B /* FileResource.swift in Sources */,
@@ -474,7 +484,9 @@
474484
D543F9BF1C14983100D16A0C /* StoryboardSegueIdentifierProtocol.swift in Sources */,
475485
D543F9C81C14995800D16A0C /* UIViewController+NibResource.swift in Sources */,
476486
D5E435A91C3CFB460091090C /* NibResource+UIKit.swift in Sources */,
487+
E250BE971CCBF60300CC71DE /* StringResource.swift in Sources */,
477488
D543F9CF1C149C0A00D16A0C /* TypedStoryboardSegueInfo+UIStoryboardSegue.swift in Sources */,
489+
E250BE941CCBCEB100CC71DE /* ColorResource+UIKit.swift in Sources */,
478490
D543F9C41C1498FB00D16A0C /* UITableView+ReuseIdentifierProtocol.swift in Sources */,
479491
D56DC7731C42B65C00623437 /* NSBundle+FileResource.swift in Sources */,
480492
D53F19241C229D7200AE2FAD /* Validatable.swift in Sources */,

0 commit comments

Comments
 (0)