Skip to content

Commit 1ae3d34

Browse files
committed
Merge branch 'master' into feature/version
2 parents 60f2486 + 009c832 commit 1ae3d34

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Documentation/Colors.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ About Colors
44
R.swift can parse .clr color palette files and generate structs in `R.colors.*`.
55
This is useful if you're using .clr color palettes as the source of colors in your project.
66

7+
_NOTE: Make sure the .clr file is part of the project, and a member of the target, for R.swift to pick it up._
8+
79
A potential work flow is this:
810
> A designer maintains a color palette called `App Colors.clr`, a developer refers to colors like so: `R.colors.appColors.errorColor()`.
911
>
@@ -19,6 +21,6 @@ The above points are not resolved by R.swift, so keep these in mind when using c
1921

2022
### Further reading
2123

24+
- Discussion on using [other file formats](https://github.com/mac-cain13/R.swift/issues/204)
2225
- R.swift issue: [Add support for R.colors from .clr files](https://github.com/mac-cain13/R.swift/issues/169)
2326
- Natasha The Robot: [Xcode Tip: Color palette](http://natashatherobot.com/xcode-color-palette/)
24-

R.swift/Generators/ResourceGenerator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func generateResourceStructsWithResources(resources: Resources, bundleIdentifier
8686
}
8787

8888
let externalResourceStruct = Struct(
89-
comments: ["This `R` struct is code generateted, and contains references to static resources."],
89+
comments: ["This `R` struct is code generated, and contains references to static resources."],
9090
type: Type(module: .Host, name: "R"),
9191
implements: [],
9292
typealiasses: [],

Readme.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let viewController = CustomViewController(nib: R.nib.customView)
2525
let string = R.string.localizable.welcomeWithName("Arthur Dent")
2626
```
2727

28-
Check out [more examples of R.swift based code](Documentation/Examples.md)!
28+
Check out [more examples](Documentation/Examples.md) or hear about [how Fabric.app uses R.swift](https://realm.io/news/slug-javi-soto-building-fabric-in-swift/#rswift-2956javascriptpresentzchangechapter053true)!
2929

3030
## Demo
3131

@@ -52,7 +52,7 @@ R.swift currently supports these types of resources:
5252
- [Storyboards](Documentation/Examples.md#storyboards)
5353
- [Segues](Documentation/Examples.md#segues)
5454
- [Nibs](Documentation/Examples.md#nibs)
55-
- [Reusable cells](Documentation/Examples.md#reusable-cells)
55+
- [Reusable cells](Documentation/Examples.md#reusable-table-view-cells)
5656

5757
Runtime validation with [`R.assertValid()`](Documentation/Examples.md#runtime-validation):
5858
- If all images used in storyboards are available
@@ -72,6 +72,8 @@ Runtime validation with [`R.assertValid()`](Documentation/Examples.md#runtime-va
7272

7373
[CocoaPods](http://cocoapods.org) is the recommended way of installation, as this avoids including any binary files into your project.
7474

75+
_Note on Carthage: R.swift is a tool that used in a build step, it is not a dynamic library. Therefore [it is not possible](https://github.com/mac-cain13/R.swift/issues/42) to install it with Carthage._
76+
7577
### CocoaPods (recommended)
7678

7779
_There is also a [short video](https://vimeo.com/122888912) of this instruction._

0 commit comments

Comments
 (0)