diff --git a/Boxer/BootlegCoverArt.swift b/Boxer/BootlegCoverArt.swift index b34d1aee7..0bbed3b04 100644 --- a/Boxer/BootlegCoverArt.swift +++ b/Boxer/BootlegCoverArt.swift @@ -108,7 +108,7 @@ class JewelCase : NSObject, BXBootlegCoverArt { open class func textAttributes(for size: NSSize) -> [NSAttributedString.Key : Any] { let lineHeight = lineHeight(for: size) let fontSize = fontSize(for: size) - let color = self.textColor; + let color = self.textColor let font = NSFont(name: self.fontName, size: fontSize) let style = NSMutableParagraphStyle() diff --git a/Other Sources/ADBToolkit/NSString+ADBStringFormatting.m b/Other Sources/ADBToolkit/NSString+ADBStringFormatting.m index f55edf3bf..b97eb6058 100644 --- a/Other Sources/ADBToolkit/NSString+ADBStringFormatting.m +++ b/Other Sources/ADBToolkit/NSString+ADBStringFormatting.m @@ -34,11 +34,11 @@ @interface NSString (ADBStringFormattingPrivate) -//Returns an array of word-wrapped lines. This doesn't handle hard linebreaks at all. -- (NSArray *) _linesWrappedByWordAtLength: (NSUInteger)maxLength; +//! Returns an array of word-wrapped lines. This doesn't handle hard linebreaks at all. +- (NSArray *) _linesWrappedByWordAtLength: (NSUInteger)maxLength; -//Returns an array of character-wrapped lines. This doesn't handle hard linebreaks at all. -- (NSArray *) _linesWrappedByCharacterAtLength: (NSUInteger)maxLength; +//! Returns an array of character-wrapped lines. This doesn't handle hard linebreaks at all. +- (NSArray *) _linesWrappedByCharacterAtLength: (NSUInteger)maxLength; @end @@ -58,7 +58,7 @@ - (NSString *) sentenceCapitalizedString NSString *capitalizedLetter = [self substringWithRange: firstLetter].uppercaseString; return [self stringByReplacingCharactersInRange: firstLetter withString: capitalizedLetter]; } - else return self; + else return [self copy]; } - (NSEnumerator *) lineEnumerator @@ -103,14 +103,16 @@ - (NSString *) stringCharacterWrappedAtLineLength: (NSUInteger)maxLength withJoi return [[self componentsSplitAtLineLength: maxLength atWordBoundaries: NO] componentsJoinedByString: joiner]; } +@end -#pragma mark - -#pragma mark Private methods +#pragma mark - Private methods + +@implementation NSString (ADBStringFormattingPrivate) -- (NSArray *) _linesWrappedByWordAtLength: (NSUInteger)maxLength +- (NSArray *) _linesWrappedByWordAtLength: (NSUInteger)maxLength { NSUInteger length = self.length; - NSMutableArray *lines = [NSMutableArray arrayWithCapacity: (NSUInteger)ceil(length / (double)maxLength)]; + NSMutableArray *lines = [NSMutableArray arrayWithCapacity: (NSUInteger)ceil(length / (double)maxLength)]; //IMPLEMENTATION NOTE: we've already split on linebreaks upstream in componentsSplitAtLineLength:atWordBoundaries, //so we don't check for them again here. It would probably be quicker to do it all in one go here though. @@ -150,12 +152,12 @@ - (NSArray *) _linesWrappedByWordAtLength: (NSUInteger)maxLength return lines; } -- (NSArray *) _linesWrappedByCharacterAtLength: (NSUInteger)maxLength +- (NSArray *) _linesWrappedByCharacterAtLength: (NSUInteger)maxLength { NSUInteger length = self.length; NSUInteger offset = 0; - NSMutableArray *lines = [NSMutableArray arrayWithCapacity: (NSUInteger)ceil(length / (double)maxLength)]; + NSMutableArray *lines = [NSMutableArray arrayWithCapacity: (NSUInteger)ceil(length / (double)maxLength)]; while (offset < length) { diff --git a/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256.png b/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256.png new file mode 100644 index 000000000..e88941f34 Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256@2x.png b/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..de1fc43e7 Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/35Diskette.iconset/icon_256x256@2x.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256.png b/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256.png new file mode 100644 index 000000000..680626ef6 Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256@2x.png b/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..d60e12f1a Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/35DisketteShine.iconset/icon_256x256@2x.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256.png b/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256.png new file mode 100644 index 000000000..ec247120f Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256@2x.png b/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..51b13577e Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/525Diskette.iconset/icon_256x256@2x.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256.png b/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256.png new file mode 100644 index 000000000..8184c1657 Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256@2x.png b/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..38ea5cc0f Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/CDCase.iconset/icon_256x256@2x.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256.png b/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256.png new file mode 100644 index 000000000..47e0c344b Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256.png differ diff --git a/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256@2x.png b/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..1e74074a5 Binary files /dev/null and b/Resources/Boxer only.xcassets/Cover Art/CDCover.iconset/icon_256x256@2x.png differ