Skip to content

Commit

Permalink
Change project prefix to BON. Change RZManuscript to BONTextConfigura…
Browse files Browse the repository at this point in the history
…tion.
  • Loading branch information
Zev Eisenberg committed Jun 18, 2015
1 parent b87419e commit c62f02f
Show file tree
Hide file tree
Showing 43 changed files with 833 additions and 833 deletions.
10 changes: 5 additions & 5 deletions Example/BonMot.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
7A5A12CA1AF6685400D111BA /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A5A12C91AF6685400D111BA /* Launch Screen.xib */; };
8FA6E2DDD5E6EC28DC1FD6CF /* libPods-BonMot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A647FB2263DC7F8E3F265C4A /* libPods-BonMot.a */; };
CD24988D1B30CBA90055F2A7 /* RZManuscriptTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD24988C1B30CBA90055F2A7 /* RZManuscriptTestCase.m */; };
CD24988D1B30CBA90055F2A7 /* BONTextConfigurationTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD24988C1B30CBA90055F2A7 /* BONTextConfigurationTestCase.m */; };
CD79AF3D1AE5820700D9F0C5 /* RZLineHeightCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD79AF3C1AE5820700D9F0C5 /* RZLineHeightCell.m */; };
CD79AF401AE5821A00D9F0C5 /* RZFigureStyleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD79AF3F1AE5821A00D9F0C5 /* RZFigureStyleCell.m */; };
CD79AF431AE5823200D9F0C5 /* RZBaselineCapHeightCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD79AF421AE5823200D9F0C5 /* RZBaselineCapHeightCell.m */; };
Expand Down Expand Up @@ -84,7 +84,7 @@
7A5A12C91AF6685400D111BA /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = "<group>"; };
A647FB2263DC7F8E3F265C4A /* libPods-BonMot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BonMot.a"; sourceTree = BUILT_PRODUCTS_DIR; };
AA5CE135D846CCB2972ED1F8 /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
CD24988C1B30CBA90055F2A7 /* RZManuscriptTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZManuscriptTestCase.m; sourceTree = "<group>"; };
CD24988C1B30CBA90055F2A7 /* BONTextConfigurationTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONTextConfigurationTestCase.m; sourceTree = "<group>"; };
CD79AF3B1AE5820700D9F0C5 /* RZLineHeightCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RZLineHeightCell.h; sourceTree = "<group>"; };
CD79AF3C1AE5820700D9F0C5 /* RZLineHeightCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RZLineHeightCell.m; sourceTree = "<group>"; };
CD79AF3E1AE5821A00D9F0C5 /* RZFigureStyleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RZFigureStyleCell.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -213,7 +213,7 @@
6003F5B5195388D20070C39A /* Tests */ = {
isa = PBXGroup;
children = (
CD24988C1B30CBA90055F2A7 /* RZManuscriptTestCase.m */,
CD24988C1B30CBA90055F2A7 /* BONTextConfigurationTestCase.m */,
6003F5B6195388D20070C39A /* Supporting Files */,
);
path = Tests;
Expand Down Expand Up @@ -350,7 +350,7 @@
6003F582195388D10070C39A /* Project object */ = {
isa = PBXProject;
attributes = {
CLASSPREFIX = RZ;
CLASSPREFIX = BON;
LastUpgradeCheck = 0510;
ORGANIZATIONNAME = "Zev Eisenberg";
TargetAttributes = {
Expand Down Expand Up @@ -497,7 +497,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CD24988D1B30CBA90055F2A7 /* RZManuscriptTestCase.m in Sources */,
CD24988D1B30CBA90055F2A7 /* BONTextConfigurationTestCase.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/BonMot/Cells/RZBaselineCapHeightCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZBaselineCapHeightCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>
static NSString* const kRZFontNameEBGaramond = @"EBGaramond12-Regular";

@interface RZBaselineCapHeightCell ()
Expand Down
8 changes: 4 additions & 4 deletions Example/BonMot/Cells/RZBaselineCapHeightCell.xib
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</subviews>
<constraints>
<constraint firstItem="jzc-8M-ftn" firstAttribute="leading" secondItem="VJ9-DC-vGd" secondAttribute="trailing" constant="8" id="3VP-rU-sQe"/>
<constraint firstItem="duU-57-K5K" firstAttribute="top" secondItem="TYF-a8-VH4" secondAttribute="top" id="43i-nf-A83" customClass="RZTextAlignmentConstraint">
<constraint firstItem="duU-57-K5K" firstAttribute="top" secondItem="TYF-a8-VH4" secondAttribute="top" id="43i-nf-A83" customClass="BONTextAlignmentConstraint">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="firstAlignment" value="cap height"/>
<userDefinedRuntimeAttribute type="string" keyPath="secondAlignment" value="cap height"/>
Expand All @@ -136,15 +136,15 @@
<constraint firstItem="VJ9-DC-vGd" firstAttribute="leading" secondItem="8H7-Bg-FVy" secondAttribute="leading" constant="15" id="K1k-x2-Izn"/>
<constraint firstItem="jzc-8M-ftn" firstAttribute="bottom" secondItem="rHu-wm-wuT" secondAttribute="bottom" id="LD1-Wp-ekD"/>
<constraint firstItem="TYF-a8-VH4" firstAttribute="leading" secondItem="InB-7c-T4a" secondAttribute="leading" id="LND-BS-GM8"/>
<constraint firstItem="mZx-Gq-awp" firstAttribute="top" secondItem="Tbm-6C-pve" secondAttribute="top" id="NHQ-UJ-vpy" customClass="RZTextAlignmentConstraint">
<constraint firstItem="mZx-Gq-awp" firstAttribute="top" secondItem="Tbm-6C-pve" secondAttribute="top" id="NHQ-UJ-vpy" customClass="BONTextAlignmentConstraint">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="firstAlignment" value="x height"/>
<userDefinedRuntimeAttribute type="string" keyPath="secondAlignment" value="top"/>
</userDefinedRuntimeAttributes>
</constraint>
<constraint firstItem="9RP-YE-1da" firstAttribute="leading" secondItem="gYi-pb-nKI" secondAttribute="leading" id="P57-nA-nSW"/>
<constraint firstItem="duU-57-K5K" firstAttribute="leading" secondItem="TYF-a8-VH4" secondAttribute="trailing" constant="8" id="Qvb-HT-pSy"/>
<constraint firstItem="duU-57-K5K" firstAttribute="top" secondItem="gYi-pb-nKI" secondAttribute="top" id="RZw-H7-y2p" customClass="RZTextAlignmentConstraint">
<constraint firstItem="duU-57-K5K" firstAttribute="top" secondItem="gYi-pb-nKI" secondAttribute="top" id="RZw-H7-y2p" customClass="BONTextAlignmentConstraint">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="firstAlignment" value="cap height"/>
<userDefinedRuntimeAttribute type="string" keyPath="secondAlignment" value="top"/>
Expand All @@ -157,7 +157,7 @@
<constraint firstItem="9RP-YE-1da" firstAttribute="trailing" secondItem="gYi-pb-nKI" secondAttribute="trailing" id="Vo4-EP-01c"/>
<constraint firstItem="VJ9-DC-vGd" firstAttribute="top" secondItem="8H7-Bg-FVy" secondAttribute="top" constant="8" id="Xeh-oT-Bpk"/>
<constraint firstItem="bgW-JM-JFZ" firstAttribute="leading" secondItem="TYF-a8-VH4" secondAttribute="trailing" constant="8" id="Yt4-X2-V15"/>
<constraint firstItem="mZx-Gq-awp" firstAttribute="top" secondItem="InB-7c-T4a" secondAttribute="top" id="dud-oa-JS6" customClass="RZTextAlignmentConstraint">
<constraint firstItem="mZx-Gq-awp" firstAttribute="top" secondItem="InB-7c-T4a" secondAttribute="top" id="dud-oa-JS6" customClass="BONTextAlignmentConstraint">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="firstAlignment" value="x-height"/>
<userDefinedRuntimeAttribute type="string" keyPath="secondAlignment" value="x-height"/>
Expand Down
8 changes: 4 additions & 4 deletions Example/BonMot/Cells/RZBaselineOffsetCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZBaselineOffsetCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

@interface RZBaselineOffsetCell ()

Expand All @@ -27,16 +27,16 @@ - (void)awakeFromNib
{
[super awakeFromNib];

RZChainLink *baseChainLink = RZCursive.string(@"❤️");
BONChainLink *baseChainLink = RZCursive.string(@"❤️");

NSMutableArray *wave = [NSMutableArray array];

for ( NSUInteger i = 0; i < 50; i++ ) {
CGFloat offset = 15.0f * sin((i / 20.0f) * 7.0f * M_PI);
[wave addObject:baseChainLink.baselineOffset(offset).manuscript];
[wave addObject:baseChainLink.baselineOffset(offset).textConfiguration];
};

self.label.attributedText = [RZManuscript joinManuscripts:wave withSeparator:nil];
self.label.attributedText = [BONTextConfiguration joinTextConfigurations:wave withSeparator:nil];
}

@end
32 changes: 16 additions & 16 deletions Example/BonMot/Cells/RZColorCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#import "RZColorCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

// Utilities
#import <BonMot/UIImage+RZManuscriptUtilities.h>
#import <BonMot/UIImage+BonMotUtilities.h>

@interface RZColorCell ()

Expand Down Expand Up @@ -42,16 +42,16 @@ - (void)awakeFromNib
@"\nMaria Sharapova ",
];

RZChainLink *baseLineHeight = RZCursive.lineHeightMultiple(1.2f);
BONChainLink *baseLineHeight = RZCursive.lineHeightMultiple(1.2f);

RZChainLink *grayFont = baseLineHeight.fontNameAndSize(@"GillSans-Light", 20.0f).textColor([UIColor darkGrayColor]);
BONChainLink *grayFont = baseLineHeight.fontNameAndSize(@"GillSans-Light", 20.0f).textColor([UIColor darkGrayColor]);

RZChainLink *fancyFont = baseLineHeight.fontNameAndSize(@"SuperClarendon-Black", 20.0f);
BONChainLink *fancyFont = baseLineHeight.fontNameAndSize(@"SuperClarendon-Black", 20.0f);

RZChainLink *blackBackground = fancyFont.textColor([UIColor whiteColor]).backgroundColor([UIColor blackColor]);
BONChainLink *blackBackground = fancyFont.textColor([UIColor whiteColor]).backgroundColor([UIColor blackColor]);

RZChainLink *redBackground = fancyFont.textColor([UIColor whiteColor]).backgroundColor([self.class raizlabsRed]);
RZChainLink *redFont = fancyFont.textColor([self.class raizlabsRed]);
BONChainLink *redBackground = fancyFont.textColor([UIColor whiteColor]).backgroundColor([self.class raizlabsRed]);
BONChainLink *redFont = fancyFont.textColor([self.class raizlabsRed]);

NSArray *chainLinks = @[
grayFont,
Expand All @@ -63,24 +63,24 @@ - (void)awakeFromNib

NSAssert(strings.count == chainLinks.count, @"wrong count");

NSMutableArray *manuscriptsWithText = [NSMutableArray array];
NSMutableArray *textConfigurationsWithText = [NSMutableArray array];

for ( NSUInteger i = 0; i < strings.count; i++ ) {
NSString *string = strings[i];
RZChainLink *link = chainLinks[i];
RZChainLink *newLink = link.string(string);
[manuscriptsWithText addObject:newLink.manuscript];
BONChainLink *link = chainLinks[i];
BONChainLink *newLink = link.string(string);
[textConfigurationsWithText addObject:newLink.textConfiguration];
}

NSAssert(manuscriptsWithText.count == strings.count, @"wrong count");
NSAssert(textConfigurationsWithText.count == strings.count, @"wrong count");

UIImage *tennisRacketImage = [UIImage imageNamed:@"Tennis Racket"];
UIImage *tinted = [tennisRacketImage rz_tintedImageWithColor:[self.class raizlabsRed]];
RZChainLink *tennisRacket = RZCursive.image(tinted).baselineOffset(-4.0f);
BONChainLink *tennisRacket = RZCursive.image(tinted).baselineOffset(-4.0f);

[manuscriptsWithText addObject:tennisRacket.manuscript];
[textConfigurationsWithText addObject:tennisRacket.textConfiguration];

NSAttributedString *attributedString = [RZManuscript joinManuscripts:manuscriptsWithText withSeparator:nil];
NSAttributedString *attributedString = [BONTextConfiguration joinTextConfigurations:textConfigurationsWithText withSeparator:nil];
self.label.attributedText = attributedString;

[self.label layoutIfNeeded];
Expand Down
10 changes: 5 additions & 5 deletions Example/BonMot/Cells/RZConcatenationCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZConcatenationCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

static const CGFloat kRZColorAlpha = 0.3f;
static const NSInteger kRZTracking = 200;
Expand All @@ -31,11 +31,11 @@ - (void)awakeFromNib
{
[super awakeFromNib];

RZManuscript *centeredSmartTracking = RZCursive.string(@"CENTERED WITH TRACKING").adobeTracking(kRZTracking).backgroundColor([[UIColor redColor] colorWithAlphaComponent:kRZColorAlpha]).manuscript;
BONTextConfiguration *centeredSmartTracking = RZCursive.string(@"CENTERED WITH TRACKING").adobeTracking(kRZTracking).backgroundColor([[UIColor redColor] colorWithAlphaComponent:kRZColorAlpha]).textConfiguration;

RZManuscript *appended = RZCursive.string(@"APPENDED").adobeTracking(kRZTracking).backgroundColor([[UIColor greenColor] colorWithAlphaComponent:kRZColorAlpha]).manuscript;
RZManuscript *smartTracking = RZCursive.string(@" SMART TRACKING").adobeTracking(kRZTracking).backgroundColor([[UIColor blueColor] colorWithAlphaComponent:kRZColorAlpha]).manuscript;
appended.nextManuscript = smartTracking;
BONTextConfiguration *appended = RZCursive.string(@"APPENDED").adobeTracking(kRZTracking).backgroundColor([[UIColor greenColor] colorWithAlphaComponent:kRZColorAlpha]).textConfiguration;
BONTextConfiguration *smartTracking = RZCursive.string(@" SMART TRACKING").adobeTracking(kRZTracking).backgroundColor([[UIColor blueColor] colorWithAlphaComponent:kRZColorAlpha]).textConfiguration;
appended.nextTextConfiguration = smartTracking;

self.centeredSmartTrackingLabel.attributedText = centeredSmartTracking.attributedString;
self.appendedSmartTrackingLabel.attributedText = appended.attributedString;
Expand Down
4 changes: 2 additions & 2 deletions Example/BonMot/Cells/RZFigureStyleCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZFigureStyleCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

static NSString* const kRZFontNameEBGaramond = @"EBGaramond12-Regular";

Expand Down Expand Up @@ -39,7 +39,7 @@ - (void)awakeFromNib

UIFont *ebGaramond = [UIFont fontWithName:kRZFontNameEBGaramond size:24.0f];

RZChainLink *commonFont = RZCursive.font(ebGaramond);
BONChainLink *commonFont = RZCursive.font(ebGaramond);

self.proportionalLiningLabel.attributedText = commonFont.string(proportionalLiningString).figureSpacing(RZFigureSpacingProportional).figureCase(RZFigureCaseLining).attributedString;

Expand Down
18 changes: 9 additions & 9 deletions Example/BonMot/Cells/RZInlineImagesCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZInlineImagesCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

@interface RZInlineImagesCell ()

Expand All @@ -31,17 +31,17 @@ - (void)awakeFromNib
UIImage *knot = [UIImage imageNamed:@"knot"];
UIImage *oar = [UIImage imageNamed:@"oar"];

RZChainLink *imageBaselineChainLink = RZCursive.baselineOffset(-8.0f);
BONChainLink *imageBaselineChainLink = RZCursive.baselineOffset(-8.0f);

RZChainLink *beeChainLink = imageBaselineChainLink.image(bee);
RZChainLink *knotChainLink = imageBaselineChainLink.image(knot);
RZChainLink *oarChainLink = imageBaselineChainLink.image(oar);
BONChainLink *beeChainLink = imageBaselineChainLink.image(bee);
BONChainLink *knotChainLink = imageBaselineChainLink.image(knot);
BONChainLink *oarChainLink = imageBaselineChainLink.image(oar);

RZChainLink *twoChainLink = RZCursive.string(@"2").fontNameAndSize(@"HelveticaNeue-Bold", 24.0f);
BONChainLink *twoChainLink = RZCursive.string(@"2").fontNameAndSize(@"HelveticaNeue-Bold", 24.0f);

RZChainLink *spaceChainLink = RZCursive.string(@" ");
BONChainLink *spaceChainLink = RZCursive.string(@" ");

RZChainLink *wholeString = RZCursive;
BONChainLink *wholeString = RZCursive;
wholeString
.append(twoChainLink)
.appendWithSeparator(@" ", beeChainLink)
Expand All @@ -54,7 +54,7 @@ - (void)awakeFromNib

self.label.attributedText = wholeString.attributedString;

NSLog(@"debug string:%@", wholeString.manuscript.debugDescription);
NSLog(@"debug string:%@", wholeString.textConfiguration.debugDescription);
}

@end
2 changes: 1 addition & 1 deletion Example/BonMot/Cells/RZLineHeightCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZLineHeightCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

@interface RZLineHeightCell ()

Expand Down
2 changes: 1 addition & 1 deletion Example/BonMot/Cells/RZTrackingCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "RZTrackingCell.h"

#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

@interface RZTrackingCell ()

Expand Down
2 changes: 1 addition & 1 deletion Example/BonMot/RZViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#import "RZConcatenationCell.h"

// Pods
#import <BonMot/RZChainLink.h>
#import <BonMot/BONChainLink.h>

@interface RZViewController ()

Expand Down
1 change: 1 addition & 0 deletions Example/Pods/Headers/Private/BonMot/BONChainLink.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Example/Pods/Headers/Private/BonMot/BONTextConfiguration.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Private/BonMot/RZChainLink.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Private/BonMot/RZManuscript.h

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

1 change: 1 addition & 0 deletions Example/Pods/Headers/Public/BonMot/BONChainLink.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Example/Pods/Headers/Public/BonMot/BONTextConfiguration.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Public/BonMot/RZChainLink.h

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Public/BonMot/RZManuscript.h

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Loading

0 comments on commit c62f02f

Please sign in to comment.