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

The unified swifty prefix #37

Merged
merged 21 commits into from
Jun 13, 2019
Merged

The unified swifty prefix #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6e36ce8
extension NSString for macOS
RomanPodymov May 26, 2019
50f2509
UIKit + SwiftyAttributes
RomanPodymov May 26, 2019
a8da890
tests for public var swiftyLargeTitleTextAttributes
RomanPodymov May 27, 2019
4480f79
fixed build error on tvOS
RomanPodymov May 27, 2019
d7597a1
fixed for tvOS again
RomanPodymov May 27, 2019
c31f4ce
moved NSString+SwiftyAttributes
RomanPodymov May 27, 2019
c4b2e96
fixed macOS build error
RomanPodymov May 27, 2019
cceb197
less functions
RomanPodymov May 27, 2019
af6f7b5
removed unused typealiases. less #if os. added documentation for new …
RomanPodymov May 29, 2019
b8058ca
add functions again
RomanPodymov May 30, 2019
8b8641a
typealiases
RomanPodymov May 30, 2019
74fb86d
Merge pull request #2 from eddiekaiger/master
RomanPodymov May 31, 2019
3b99314
added NSString extension to project
RomanPodymov May 31, 2019
c28404e
Update NSString+SwiftyAttributes.swift
RomanPodymov Jun 1, 2019
3964889
tests
RomanPodymov Jun 2, 2019
558587a
Update NSString+macOS.swift
RomanPodymov Jun 2, 2019
b91d650
removed functions without tests
RomanPodymov Jun 4, 2019
5dbcbbf
swifty_
RomanPodymov Jun 6, 2019
27f62bc
swifty_ -> swifty
RomanPodymov Jun 11, 2019
6f35252
Merge pull request #3 from eddiekaiger/master
RomanPodymov Jun 11, 2019
2dd2e6d
Merge branch 'feature/uikit' into feature/swifty_prefix
RomanPodymov Jun 11, 2019
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
4 changes: 2 additions & 2 deletions SwiftyAttributes/Sources/common/NSString+SwiftyAttributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extension NSString {

- parameter attrs: The attributes to use.
*/
public func swifty_size(withSwiftyAttributes attrs: [Attribute]? = nil) -> Size {
public func swiftySize(withSwiftyAttributes attrs: [Attribute]? = nil) -> Size {
return size(withAttributes: attrs?.foundationAttributes)
}

Expand All @@ -41,7 +41,7 @@ extension NSString {
- parameter swiftyAttributes: The attributes to use.
- parameter context: Drawing context.
*/
public func swifty_boundingRect(with size: Size, options: DrawingOptions = [], swiftyAttributes: [Attribute]? = nil, context: DrawingContext?) -> Rect {
public func swiftyBoundingRect(with size: Size, options: DrawingOptions = [], swiftyAttributes: [Attribute]? = nil, context: DrawingContext?) -> Rect {
return boundingRect(with: size, options: options, attributes: swiftyAttributes?.foundationAttributes, context: context)
}
}
2 changes: 1 addition & 1 deletion SwiftyAttributes/Sources/macOS/NSString+macOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extension NSString {
- parameter swiftyAttributes: The attributes to use.
*/
@available(macOS, deprecated: 10.12)
public func swifty_boundingRect(with size: Size, options: DrawingOptions = [], swiftyAttributes: [Attribute]? = nil) -> Rect {
public func swiftyBoundingRect(with size: Size, options: DrawingOptions = [], swiftyAttributes: [Attribute]? = nil) -> Rect {
return boundingRect(with: size, options: options, attributes: swiftyAttributes?.foundationAttributes)
}
}
Expand Down
6 changes: 3 additions & 3 deletions SwiftyAttributesTests/NSString_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ class NSString_Tests: XCTestCase {

func testSizeWithSwiftyAttributes() {
let testString = "Hello World" as NSString
let subject = testString.swifty_size(withSwiftyAttributes: subjectAttributes)
let subject = testString.swiftySize(withSwiftyAttributes: subjectAttributes)
let expected = testString.size(withAttributes: expectedAttributes)
XCTAssertEqual(subject, expected)
}

func testBoundingRectWithSizeOptionsSwiftyAttributesContext() {
let testString = "Hello World" as NSString
let testSize = CGSize(width: 50, height: 100)
let subject = testString.swifty_boundingRect(
let subject = testString.swiftyBoundingRect(
with: testSize,
options: [],
swiftyAttributes: subjectAttributes,
Expand All @@ -52,7 +52,7 @@ class NSString_Tests: XCTestCase {
func testBoundingRectWithSizeOptionsSwiftyAttributes() {
let testString = "Hello World" as NSString
let testSize = CGSize(width: 50, height: 100)
let subject = testString.swifty_boundingRect(
let subject = testString.swiftyBoundingRect(
with: testSize,
options: [],
swiftyAttributes: subjectAttributes
Expand Down