diff --git a/Example/BonMot.xcodeproj/project.pbxproj b/Example/BonMot.xcodeproj/project.pbxproj index a7fdebfb..fdbac00b 100644 --- a/Example/BonMot.xcodeproj/project.pbxproj +++ b/Example/BonMot.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; 6836AD13A829A45AE2425588 /* Pods_BonMot_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFD6D97A946F2FEF294F4BBB /* Pods_BonMot_Tests.framework */; }; CD6DEFE11BF6ADF900676E2D /* BONBaseTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFD61BF6ADF900676E2D /* BONBaseTestCase.m */; }; - CD6DEFE31BF6ADF900676E2D /* BONChainableTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFD71BF6ADF900676E2D /* BONChainableTestCase.m */; }; + CD6DEFE31BF6ADF900676E2D /* BONTextableTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFD71BF6ADF900676E2D /* BONTextableTestCase.m */; }; CD6DEFE51BF6ADF900676E2D /* BONChainEmptyStringTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFD81BF6ADF900676E2D /* BONChainEmptyStringTestCase.m */; }; CD6DEFE71BF6ADF900676E2D /* BONDebugStringTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFD91BF6ADF900676E2D /* BONDebugStringTestCase.m */; }; CD6DEFE91BF6ADF900676E2D /* BONDictionaryEqualityTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6DEFDA1BF6ADF900676E2D /* BONDictionaryEqualityTestCase.m */; }; @@ -99,7 +99,7 @@ AEA43FE0E796D75B40E7EF87 /* Pods-BonMot_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BonMot_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BonMot_Tests/Pods-BonMot_Tests.release.xcconfig"; sourceTree = ""; }; CD6DEFD51BF6ADF900676E2D /* BONBaseTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BONBaseTestCase.h; sourceTree = ""; }; CD6DEFD61BF6ADF900676E2D /* BONBaseTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONBaseTestCase.m; sourceTree = ""; }; - CD6DEFD71BF6ADF900676E2D /* BONChainableTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONChainableTestCase.m; sourceTree = ""; }; + CD6DEFD71BF6ADF900676E2D /* BONTextableTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONTextableTestCase.m; sourceTree = ""; }; CD6DEFD81BF6ADF900676E2D /* BONChainEmptyStringTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONChainEmptyStringTestCase.m; sourceTree = ""; }; CD6DEFD91BF6ADF900676E2D /* BONDebugStringTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONDebugStringTestCase.m; sourceTree = ""; }; CD6DEFDA1BF6ADF900676E2D /* BONDictionaryEqualityTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BONDictionaryEqualityTestCase.m; sourceTree = ""; }; @@ -270,7 +270,7 @@ children = ( CD6DEFD51BF6ADF900676E2D /* BONBaseTestCase.h */, CD6DEFD61BF6ADF900676E2D /* BONBaseTestCase.m */, - CD6DEFD71BF6ADF900676E2D /* BONChainableTestCase.m */, + CD6DEFD71BF6ADF900676E2D /* BONTextableTestCase.m */, CD6DEFD81BF6ADF900676E2D /* BONChainEmptyStringTestCase.m */, CD6DEFD91BF6ADF900676E2D /* BONDebugStringTestCase.m */, CD6DEFDA1BF6ADF900676E2D /* BONDictionaryEqualityTestCase.m */, @@ -608,7 +608,7 @@ CD6DEFED1BF6ADF900676E2D /* BONPropertyClobberingTestCase.m in Sources */, CD6DEFF11BF6ADF900676E2D /* BONTextAlignmentTestCase.m in Sources */, CD6DEFE11BF6ADF900676E2D /* BONBaseTestCase.m in Sources */, - CD6DEFE31BF6ADF900676E2D /* BONChainableTestCase.m in Sources */, + CD6DEFE31BF6ADF900676E2D /* BONTextableTestCase.m in Sources */, CDE658581C24ADD8009C7D09 /* BONUnderlineAndStrikethroughTestCase.m in Sources */, CD6DEFF31BF6ADF900676E2D /* BONTrackingTestCase.m in Sources */, CD6DEFE91BF6ADF900676E2D /* BONDictionaryEqualityTestCase.m in Sources */, diff --git a/Example/Pods/Headers/Private/BonMot/BONChainable.h b/Example/Pods/Headers/Private/BonMot/BONChainable.h deleted file mode 120000 index df09463a..00000000 --- a/Example/Pods/Headers/Private/BonMot/BONChainable.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../Pod/Classes/BONChainable.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/BonMot/BONTextable.h b/Example/Pods/Headers/Private/BonMot/BONTextable.h new file mode 120000 index 00000000..c00b7cb1 --- /dev/null +++ b/Example/Pods/Headers/Private/BonMot/BONTextable.h @@ -0,0 +1 @@ +../../../../../Pod/Classes/BONTextable.h \ No newline at end of file diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 426bdf6a..70eb0f3a 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,36 +7,36 @@ objects = { /* Begin PBXBuildFile section */ - 06418702080605588CE4CF8F56DF686B /* BONText.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FD81B6C94475DD10E7DD38161A11E55 /* BONText.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0A4D90573849426C021775B1F30BFED3 /* BONText.m in Sources */ = {isa = PBXBuildFile; fileRef = 409B06E591259282FD84D1BA6CAACCBA /* BONText.m */; }; - 1EB2254AD62E37D912511C5E32893983 /* BONChain.h in Headers */ = {isa = PBXBuildFile; fileRef = F319C916B36897FF0AB616963A545A4A /* BONChain.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0A4D90573849426C021775B1F30BFED3 /* BONText.m in Sources */ = {isa = PBXBuildFile; fileRef = 63397F47E9EDBD3B3AB7C63CA62C9A60 /* BONText.m */; }; + 13DCD41335D745CA1CED7356045D20C5 /* UIImage+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 539FA11680FCD1406D3E2B404381B75D /* UIImage+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 17113DDC76A3C7E3C4E9A9375BCF08AD /* BonMot.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B2BC5AADC6EDA5DCE0297B909A340ED /* BonMot.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 181D411C8B6DB8A2075AB8DE9C134A60 /* BonMot-UI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED184F3E3EB07D94DFE4F44F7D5A2895 /* BonMot-UI.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1F56F6E60862159F5BF8318AACB029F8 /* BonMot-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1957144DDBC6AAFCCC6C75584E798D /* BonMot-dummy.m */; }; 2097482FF22840BA9837D9736789899D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B7BDF5CE5CB8F095FE12DA55D9A9BB /* UIKit.framework */; }; - 3FA87F0375EAA1CE55B505E74408EFEC /* BonMot-UI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED184F3E3EB07D94DFE4F44F7D5A2895 /* BonMot-UI.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 21D1AF40D2C0BE5724851EC56C3B59F3 /* BONCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 93538ADC629BB1FE57D7D8A4900E2DD5 /* BONCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 413CEEFE64323AE73DA239FFA5FCAA36 /* BONSpecial.h in Headers */ = {isa = PBXBuildFile; fileRef = D09A1FB35714AC32090B289A6DDC1189 /* BONSpecial.h */; settings = {ATTRIBUTES = (Public, ); }; }; 45EB385A63AF0AA85959AE03497B88E4 /* Pods-BonMot_Tests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 26DAE09174C6886D8EFBA0B3C9BF3BDB /* Pods-BonMot_Tests-dummy.m */; }; - 4A146146EB509FE26F4779A913D5FC17 /* BonMot.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B2BC5AADC6EDA5DCE0297B909A340ED /* BonMot.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D6724EA32DA962637AA9F775A0BA251 /* UILabel+BonMotUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = FF9EEA2A97C457E8C2BD114BF30D8059 /* UILabel+BonMotUtilities.m */; }; - 5F46B4F9787303E9BC5C7B6F60721A67 /* UIImage+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 18926F1DFC656FA5D4D500363C4F782B /* UIImage+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6391BAE3523A5C96443CB42EDA5603A1 /* BONSpecial.m in Sources */ = {isa = PBXBuildFile; fileRef = FD849E3C6E08128DBDF5FEC6971168DD /* BONSpecial.m */; }; + 624FB42187F5EF2215935ADEC65E4C21 /* UILabel+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = C62A9A489A5F07436D988B6724CE57E7 /* UILabel+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 637838656B7C895490FB05DC384861BE /* BonMot-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F83BFF5366AB7505DF3FE30FC1D897C /* BonMot-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6391BAE3523A5C96443CB42EDA5603A1 /* BONSpecial.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5721F272B13E241C17EC5CCBECED88 /* BONSpecial.m */; }; 6DF232828E6B3CBE1ACC399FC09F0EFF /* UITextField+BonMotUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A6A6C324134DCF48F5C9B07AD6DA1E7 /* UITextField+BonMotUtilities.m */; }; - 72287CBE088D3F77934DE84F46188EEF /* UITextView+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B0F060095EBA2829B1EF12C9F35A7FB5 /* UITextView+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7511FB1016731034F1334DF7BB1C9FAB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E7E5AF37923BFA48D6994B9BFC6535F /* Foundation.framework */; }; - 75E3ABD8D49597BA7B4C899D4C81331B /* BONSpecial.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C93BA6F98CE9B457B98A93BC1E5C74 /* BONSpecial.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8013CA028C6CC373F7C4180175E479A6 /* BONChainable.h in Headers */ = {isa = PBXBuildFile; fileRef = 86957A15D5FE23871E28D3C60CF85B6D /* BONChainable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 779704D27B30E4D05FD335EF80EDE037 /* UITextField+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 39ECB0B2DABFCD1FC63B763394CE3EFD /* UITextField+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; 82CA6517CFCBD1CC5D4D001E9D7A6427 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E7E5AF37923BFA48D6994B9BFC6535F /* Foundation.framework */; }; + 84D20614E9B910AE1B13EE2FA0AA631C /* BONTextable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFD7C43ECBA20E128341EF49D5FFFE0 /* BONTextable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 91F65541B941B3D7C4383B7F5C6D5196 /* UITextView+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B0F060095EBA2829B1EF12C9F35A7FB5 /* UITextView+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9CEA0E53F516C3F512419A8DC5A93D5C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E7E5AF37923BFA48D6994B9BFC6535F /* Foundation.framework */; }; A12E14EC4204027DB47485EDD0600EE3 /* UITextView+BonMotUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 873BE9F4D8E3260E1B2B51BDC013F654 /* UITextView+BonMotUtilities.m */; }; - B263D408EC2DEA444C8D1AB48C02FDB1 /* UIImage+BonMotUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F3FBD1F7888D8DBBFAD8D499D771E59E /* UIImage+BonMotUtilities.m */; }; - B49C5B26A15A41862A7E731EDE485E8E /* BONTextAlignmentConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 437AA09126C984A62D6D8EA04959C072 /* BONTextAlignmentConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B78A886854C9C851442EB7661B8C730C /* BONText_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B16F89E874C87C0FFF4C4F5CFFC77B5 /* BONText_Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; - BB31E3EC874939A54242BB3EF903D04D /* BonMot-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F83BFF5366AB7505DF3FE30FC1D897C /* BonMot-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B263D408EC2DEA444C8D1AB48C02FDB1 /* UIImage+BonMotUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = C579639D984A1B5FB723829F7B330134 /* UIImage+BonMotUtilities.m */; }; + CC475448B964E230AC0A3A0D668C1659 /* BONChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 776F79C216D9F4477160114C3F9E2D6A /* BONChain.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D716DB07D9C606B2FB3DAACE8CC0D794 /* BONText.h in Headers */ = {isa = PBXBuildFile; fileRef = 50B014FB9363142F3C203CC8D37A2238 /* BONText.h */; settings = {ATTRIBUTES = (Public, ); }; }; DEB00DF039E1CA771FBBC53D23CDD7EA /* Pods-BonMot_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E40A36D2E548722345E1738CFBAB4824 /* Pods-BonMot_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DF7C85A321BE9496CC71265DCC39F457 /* UILabel+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = C62A9A489A5F07436D988B6724CE57E7 /* UILabel+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; E2E7D9F8E52A8BFD913B85964D4BC526 /* Pods-BonMot_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D0FDE2C7008028D72D6FB445DF416ABD /* Pods-BonMot_Example-dummy.m */; }; - ECA1A465C028FDD7690D6CB20A317533 /* BONCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D4144F69FAD5D24745D783B3211FDC9 /* BONCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E938B90DE8693013114F894D99C6CDF8 /* BONTextAlignmentConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 437AA09126C984A62D6D8EA04959C072 /* BONTextAlignmentConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; }; ECC505807DF917E9F22948F3EA906F05 /* BONTextAlignmentConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FE13FA28606238880F321A4656DA7FB /* BONTextAlignmentConstraint.m */; }; - F384061E39844528D96E2470EA211220 /* UITextField+BonMotUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 39ECB0B2DABFCD1FC63B763394CE3EFD /* UITextField+BonMotUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F8DD94EA2A44CAA5BF8B4B7256F6BADA /* BONChain.m in Sources */ = {isa = PBXBuildFile; fileRef = F743FE6EED885797FC6C1DD4AACA7092 /* BONChain.m */; }; + F616776D8F57FB76F1C906C94D29359D /* BONText_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4212363CDD5CC5B6EE4D73A5CC4A28EF /* BONText_Private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + F8DD94EA2A44CAA5BF8B4B7256F6BADA /* BONChain.m in Sources */ = {isa = PBXBuildFile; fileRef = 50829E4766FEB3099AD5A28270D99914 /* BONChain.m */; }; F996D2E26CD444025BEEF2E9D5605760 /* Pods-BonMot_Tests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C7008BD5F4245F12DCD72A0FC7BCC83C /* Pods-BonMot_Tests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ @@ -60,44 +60,48 @@ /* Begin PBXFileReference section */ 0918C87910956FED935D88D6DB334CFB /* Pods-BonMot_Tests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-BonMot_Tests-frameworks.sh"; sourceTree = ""; }; 0B2BC5AADC6EDA5DCE0297B909A340ED /* BonMot.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BonMot.h; sourceTree = ""; }; - 18926F1DFC656FA5D4D500363C4F782B /* UIImage+BonMotUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UIImage+BonMotUtilities.h"; sourceTree = ""; }; 1F83BFF5366AB7505DF3FE30FC1D897C /* BonMot-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BonMot-umbrella.h"; sourceTree = ""; }; - 1FD81B6C94475DD10E7DD38161A11E55 /* BONText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONText.h; sourceTree = ""; }; - 21C93BA6F98CE9B457B98A93BC1E5C74 /* BONSpecial.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONSpecial.h; sourceTree = ""; }; 26DAE09174C6886D8EFBA0B3C9BF3BDB /* Pods-BonMot_Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-BonMot_Tests-dummy.m"; sourceTree = ""; }; 33E52D65DA852755FC89F75BEA02503F /* Pods-BonMot_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BonMot_Tests.release.xcconfig"; sourceTree = ""; }; 39ECB0B2DABFCD1FC63B763394CE3EFD /* UITextField+BonMotUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UITextField+BonMotUtilities.h"; sourceTree = ""; }; - 409B06E591259282FD84D1BA6CAACCBA /* BONText.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONText.m; sourceTree = ""; }; + 3D5721F272B13E241C17EC5CCBECED88 /* BONSpecial.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONSpecial.m; sourceTree = ""; }; + 4212363CDD5CC5B6EE4D73A5CC4A28EF /* BONText_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONText_Private.h; sourceTree = ""; }; 435463AFCD23B71C80A85D625BB305CB /* Pods-BonMot_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-BonMot_Tests-acknowledgements.markdown"; sourceTree = ""; }; 437AA09126C984A62D6D8EA04959C072 /* BONTextAlignmentConstraint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONTextAlignmentConstraint.h; sourceTree = ""; }; - 4B16F89E874C87C0FFF4C4F5CFFC77B5 /* BONText_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONText_Private.h; sourceTree = ""; }; 4C4450E89E7003A9B4F4B4AA685F16EA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4C7198A0A8D85E86ABDB02566E17CE0D /* Pods-BonMot_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BonMot_Example.debug.xcconfig"; sourceTree = ""; }; 4F2146CD3B43AAD92339D41681616284 /* Pods-BonMot_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-BonMot_Example.modulemap"; sourceTree = ""; }; + 50829E4766FEB3099AD5A28270D99914 /* BONChain.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONChain.m; sourceTree = ""; }; + 50B014FB9363142F3C203CC8D37A2238 /* BONText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONText.h; sourceTree = ""; }; 51D4DC924673736C887833A213B8733A /* Pods-BonMot_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BonMot_Example.release.xcconfig"; sourceTree = ""; }; + 539FA11680FCD1406D3E2B404381B75D /* UIImage+BonMotUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UIImage+BonMotUtilities.h"; sourceTree = ""; }; 55572D20A461EDABEAD1B8C1D03101A2 /* Pods_BonMot_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BonMot_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5AFD7C43ECBA20E128341EF49D5FFFE0 /* BONTextable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONTextable.h; sourceTree = ""; }; 621B433020566394142071265EABE9A0 /* Pods-BonMot_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-BonMot_Example-resources.sh"; sourceTree = ""; }; + 63397F47E9EDBD3B3AB7C63CA62C9A60 /* BONText.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONText.m; sourceTree = ""; }; 690A840FE201A4B932BB6539F2BA5173 /* Pods-BonMot_Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-BonMot_Tests.modulemap"; sourceTree = ""; }; 6C3A2FADB025B64FEEAE2DFC85035890 /* Pods_BonMot_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BonMot_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6E7E5AF37923BFA48D6994B9BFC6535F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 6FE13FA28606238880F321A4656DA7FB /* BONTextAlignmentConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONTextAlignmentConstraint.m; sourceTree = ""; }; 75787587D6CC99EAC1321E3BC29A6276 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 776F79C216D9F4477160114C3F9E2D6A /* BONChain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONChain.h; sourceTree = ""; }; 7AA4AFFEF440529E9D52D5EAC848B442 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 86957A15D5FE23871E28D3C60CF85B6D /* BONChainable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONChainable.h; sourceTree = ""; }; 873BE9F4D8E3260E1B2B51BDC013F654 /* UITextView+BonMotUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UITextView+BonMotUtilities.m"; sourceTree = ""; }; 8A6A6C324134DCF48F5C9B07AD6DA1E7 /* UITextField+BonMotUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UITextField+BonMotUtilities.m"; sourceTree = ""; }; 8B9A7F78A71EB4371EA47808D1A40E61 /* BonMot.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = BonMot.xcconfig; sourceTree = ""; }; + 93538ADC629BB1FE57D7D8A4900E2DD5 /* BONCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONCompatibility.h; sourceTree = ""; }; 987B388AEB3482E871DC28F0AE48017A /* BonMot.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BonMot.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D4144F69FAD5D24745D783B3211FDC9 /* BONCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONCompatibility.h; sourceTree = ""; }; A03AFD7A68BE8224BF54B742392FB216 /* Pods-BonMot_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-BonMot_Tests.debug.xcconfig"; sourceTree = ""; }; A4FC1DAF3C2A249E641CA572FCEF3426 /* Pods-BonMot_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-BonMot_Tests-resources.sh"; sourceTree = ""; }; B0F060095EBA2829B1EF12C9F35A7FB5 /* UITextView+BonMotUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UITextView+BonMotUtilities.h"; sourceTree = ""; }; BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; C3B7BDF5CE5CB8F095FE12DA55D9A9BB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + C579639D984A1B5FB723829F7B330134 /* UIImage+BonMotUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UIImage+BonMotUtilities.m"; sourceTree = ""; }; C62A9A489A5F07436D988B6724CE57E7 /* UILabel+BonMotUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UILabel+BonMotUtilities.h"; sourceTree = ""; }; C7008BD5F4245F12DCD72A0FC7BCC83C /* Pods-BonMot_Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-BonMot_Tests-umbrella.h"; sourceTree = ""; }; CA1957144DDBC6AAFCCC6C75584E798D /* BonMot-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "BonMot-dummy.m"; sourceTree = ""; }; CB2FD0FB92AFB48BF4840DB66DE560C8 /* Pods-BonMot_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-BonMot_Example-acknowledgements.markdown"; sourceTree = ""; }; + D09A1FB35714AC32090B289A6DDC1189 /* BONSpecial.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONSpecial.h; sourceTree = ""; }; D0FDE2C7008028D72D6FB445DF416ABD /* Pods-BonMot_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-BonMot_Example-dummy.m"; sourceTree = ""; }; DB10352B2AAD2C93526F983E38D5DBF6 /* BonMot.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = BonMot.modulemap; sourceTree = ""; }; E25641E248FCA33FB78676B255411C8B /* Pods-BonMot_Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-BonMot_Tests-acknowledgements.plist"; sourceTree = ""; }; @@ -106,10 +110,6 @@ E89F36821E111202094A68FE7AC830A8 /* BonMot-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BonMot-prefix.pch"; sourceTree = ""; }; E9C5BFEE6B78D9F70782C6B7734BD9DB /* Pods-BonMot_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-BonMot_Example-acknowledgements.plist"; sourceTree = ""; }; ED184F3E3EB07D94DFE4F44F7D5A2895 /* BonMot-UI.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BonMot-UI.h"; sourceTree = ""; }; - F319C916B36897FF0AB616963A545A4A /* BONChain.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = BONChain.h; sourceTree = ""; }; - F3FBD1F7888D8DBBFAD8D499D771E59E /* UIImage+BonMotUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UIImage+BonMotUtilities.m"; sourceTree = ""; }; - F743FE6EED885797FC6C1DD4AACA7092 /* BONChain.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONChain.m; sourceTree = ""; }; - FD849E3C6E08128DBDF5FEC6971168DD /* BONSpecial.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = BONSpecial.m; sourceTree = ""; }; FF9EEA2A97C457E8C2BD114BF30D8059 /* UILabel+BonMotUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UILabel+BonMotUtilities.m"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -156,6 +156,24 @@ path = "Example/Pods/Target Support Files/BonMot"; sourceTree = ""; }; + 16246878EF088223CED1F7DB60822627 /* Classes */ = { + isa = PBXGroup; + children = ( + 776F79C216D9F4477160114C3F9E2D6A /* BONChain.h */, + 50829E4766FEB3099AD5A28270D99914 /* BONChain.m */, + 93538ADC629BB1FE57D7D8A4900E2DD5 /* BONCompatibility.h */, + D09A1FB35714AC32090B289A6DDC1189 /* BONSpecial.h */, + 3D5721F272B13E241C17EC5CCBECED88 /* BONSpecial.m */, + 50B014FB9363142F3C203CC8D37A2238 /* BONText.h */, + 63397F47E9EDBD3B3AB7C63CA62C9A60 /* BONText.m */, + 4212363CDD5CC5B6EE4D73A5CC4A28EF /* BONText_Private.h */, + 5AFD7C43ECBA20E128341EF49D5FFFE0 /* BONTextable.h */, + 539FA11680FCD1406D3E2B404381B75D /* UIImage+BonMotUtilities.h */, + C579639D984A1B5FB723829F7B330134 /* UIImage+BonMotUtilities.m */, + ); + path = Classes; + sourceTree = ""; + }; 18340F12838DEE43507667CC74401EB1 /* iOS */ = { isa = PBXGroup; children = ( @@ -256,29 +274,11 @@ path = UI; sourceTree = ""; }; - 901A5D7F8F8D702C90F8AA3247A9AF61 /* Classes */ = { - isa = PBXGroup; - children = ( - F319C916B36897FF0AB616963A545A4A /* BONChain.h */, - F743FE6EED885797FC6C1DD4AACA7092 /* BONChain.m */, - 86957A15D5FE23871E28D3C60CF85B6D /* BONChainable.h */, - 9D4144F69FAD5D24745D783B3211FDC9 /* BONCompatibility.h */, - 21C93BA6F98CE9B457B98A93BC1E5C74 /* BONSpecial.h */, - FD849E3C6E08128DBDF5FEC6971168DD /* BONSpecial.m */, - 1FD81B6C94475DD10E7DD38161A11E55 /* BONText.h */, - 409B06E591259282FD84D1BA6CAACCBA /* BONText.m */, - 4B16F89E874C87C0FFF4C4F5CFFC77B5 /* BONText_Private.h */, - 18926F1DFC656FA5D4D500363C4F782B /* UIImage+BonMotUtilities.h */, - F3FBD1F7888D8DBBFAD8D499D771E59E /* UIImage+BonMotUtilities.m */, - ); - path = Classes; - sourceTree = ""; - }; AC3320870243C181B568C155197A3C7D /* Pod */ = { isa = PBXGroup; children = ( 0B2BC5AADC6EDA5DCE0297B909A340ED /* BonMot.h */, - 901A5D7F8F8D702C90F8AA3247A9AF61 /* Classes */, + 16246878EF088223CED1F7DB60822627 /* Classes */, ); path = Pod; sourceTree = ""; @@ -336,24 +336,24 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 115D12CC1AFE2C6EEFC4DA5FC7EB45CF /* Headers */ = { + 19C69E0D6A74D07949AF521FA62CB367 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1EB2254AD62E37D912511C5E32893983 /* BONChain.h in Headers */, - 8013CA028C6CC373F7C4180175E479A6 /* BONChainable.h in Headers */, - ECA1A465C028FDD7690D6CB20A317533 /* BONCompatibility.h in Headers */, - 3FA87F0375EAA1CE55B505E74408EFEC /* BonMot-UI.h in Headers */, - BB31E3EC874939A54242BB3EF903D04D /* BonMot-umbrella.h in Headers */, - 4A146146EB509FE26F4779A913D5FC17 /* BonMot.h in Headers */, - 75E3ABD8D49597BA7B4C899D4C81331B /* BONSpecial.h in Headers */, - 06418702080605588CE4CF8F56DF686B /* BONText.h in Headers */, - B78A886854C9C851442EB7661B8C730C /* BONText_Private.h in Headers */, - B49C5B26A15A41862A7E731EDE485E8E /* BONTextAlignmentConstraint.h in Headers */, - 5F46B4F9787303E9BC5C7B6F60721A67 /* UIImage+BonMotUtilities.h in Headers */, - DF7C85A321BE9496CC71265DCC39F457 /* UILabel+BonMotUtilities.h in Headers */, - F384061E39844528D96E2470EA211220 /* UITextField+BonMotUtilities.h in Headers */, - 72287CBE088D3F77934DE84F46188EEF /* UITextView+BonMotUtilities.h in Headers */, + CC475448B964E230AC0A3A0D668C1659 /* BONChain.h in Headers */, + 21D1AF40D2C0BE5724851EC56C3B59F3 /* BONCompatibility.h in Headers */, + 181D411C8B6DB8A2075AB8DE9C134A60 /* BonMot-UI.h in Headers */, + 637838656B7C895490FB05DC384861BE /* BonMot-umbrella.h in Headers */, + 17113DDC76A3C7E3C4E9A9375BCF08AD /* BonMot.h in Headers */, + 413CEEFE64323AE73DA239FFA5FCAA36 /* BONSpecial.h in Headers */, + D716DB07D9C606B2FB3DAACE8CC0D794 /* BONText.h in Headers */, + F616776D8F57FB76F1C906C94D29359D /* BONText_Private.h in Headers */, + 84D20614E9B910AE1B13EE2FA0AA631C /* BONTextable.h in Headers */, + E938B90DE8693013114F894D99C6CDF8 /* BONTextAlignmentConstraint.h in Headers */, + 13DCD41335D745CA1CED7356045D20C5 /* UIImage+BonMotUtilities.h in Headers */, + 624FB42187F5EF2215935ADEC65E4C21 /* UILabel+BonMotUtilities.h in Headers */, + 779704D27B30E4D05FD335EF80EDE037 /* UITextField+BonMotUtilities.h in Headers */, + 91F65541B941B3D7C4383B7F5C6D5196 /* UITextView+BonMotUtilities.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -382,7 +382,7 @@ buildPhases = ( 0E96CA58B2B44FCF77771D41417C4E22 /* Sources */, 830D0D7E2FA7BEF67924795C5853C526 /* Frameworks */, - 115D12CC1AFE2C6EEFC4DA5FC7EB45CF /* Headers */, + 19C69E0D6A74D07949AF521FA62CB367 /* Headers */, ); buildRules = ( ); diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BonMot.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BonMot.xcscheme index a476c9e1..17a93cd9 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BonMot.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BonMot.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES"> diff --git a/Example/Pods/Target Support Files/BonMot/BonMot-umbrella.h b/Example/Pods/Target Support Files/BonMot/BonMot-umbrella.h index 745a2b8a..9477b91f 100644 --- a/Example/Pods/Target Support Files/BonMot/BonMot-umbrella.h +++ b/Example/Pods/Target Support Files/BonMot/BonMot-umbrella.h @@ -2,10 +2,10 @@ #import "BonMot.h" #import "BONChain.h" -#import "BONChainable.h" #import "BONCompatibility.h" #import "BONSpecial.h" #import "BONText.h" +#import "BONTextable.h" #import "UIImage+BonMotUtilities.h" #import "BonMot-UI.h" #import "BONTextAlignmentConstraint.h" diff --git a/Example/Tests/BONChainableTestCase.m b/Example/Tests/BONTextableTestCase.m similarity index 98% rename from Example/Tests/BONChainableTestCase.m rename to Example/Tests/BONTextableTestCase.m index 7b42a52c..f5159d7d 100644 --- a/Example/Tests/BONChainableTestCase.m +++ b/Example/Tests/BONTextableTestCase.m @@ -1,5 +1,5 @@ // -// BONChainableTestCase.m +// BONTextableTestCase.m // BonMot // // Created by Zev Eisenberg on 10/9/15. @@ -10,11 +10,11 @@ @import BonMot; -@interface BONChainableTestCase : BONBaseTestCase +@interface BONTextableTestCase : BONBaseTestCase @end -@implementation BONChainableTestCase +@implementation BONTextableTestCase - (void)testConcatenation { diff --git a/Example/Tests/BONUtilitiesTestCase.m b/Example/Tests/BONUtilitiesTestCase.m index 87d716d9..8744cb15 100644 --- a/Example/Tests/BONUtilitiesTestCase.m +++ b/Example/Tests/BONUtilitiesTestCase.m @@ -37,11 +37,11 @@ @implementation BONUtilitiesTestCase #pragma mark - UILabel -- (void)testLabelTextAfterChainable +- (void)testLabelTextAfterTextable { UILabel *label = UILabel.new; - label.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); - label.textAndApplyChainable = @"Hello, world!"; + label.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); + label.bonString = @"Hello, world!"; XCTAssertEqualObjects(label.attributedText.string, @"Hello, world!"); @@ -57,11 +57,11 @@ - (void)testLabelTextAfterChainable BONAssertAttributedStringHasAttributes(label.attributedText, controlAttributes); } -- (void)testLabelTextBeforeChainable +- (void)testLabelTextBeforeTextable { UILabel *label = UILabel.new; - label.textAndApplyChainable = @"Hello, world!"; - label.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + label.bonString = @"Hello, world!"; + label.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); XCTAssertEqualObjects(label.attributedText.string, @"Hello, world!"); @@ -77,10 +77,10 @@ - (void)testLabelTextBeforeChainable BONAssertAttributedStringHasAttributes(label.attributedText, controlAttributes); } -- (void)testLabelAttributedTextAfterChainable +- (void)testLabelAttributedTextAfterTextable { UILabel *label = UILabel.new; - label.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + label.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); label.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; XCTAssertEqualObjects(label.attributedText.string, @"Hello, world!"); @@ -90,13 +90,13 @@ - (void)testLabelAttributedTextAfterChainable BONAssertAttributedStringHasAttributes(label.attributedText, controlAttributes); } -- (void)testLabelAttributedTextBeforeChainable +- (void)testLabelAttributedTextBeforeTextable { UILabel *label = UILabel.new; label.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; - label.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + label.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); - XCTAssertNotNil(label.bonChainable); + XCTAssertNotNil(label.bonTextable); XCTAssertEqualObjects(label.attributedText.string, @"Hello, world!"); NSParagraphStyle *defaultParagraphStyle = [[NSParagraphStyle alloc] init]; @@ -113,11 +113,11 @@ - (void)testLabelAttributedTextBeforeChainable #pragma mark - UITextView -- (void)testTextViewTextAfterChainable +- (void)testTextViewTextAfterTextable { UITextView *textView = UITextView.new; - textView.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); - textView.textAndApplyChainable = @"Hello, world!"; + textView.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); + textView.bonString = @"Hello, world!"; XCTAssertEqualObjects(textView.attributedText.string, @"Hello, world!"); @@ -133,11 +133,11 @@ - (void)testTextViewTextAfterChainable BONAssertAttributedStringHasAttributes(textView.attributedText, controlAttributes); } -- (void)testTextViewTextBeforeChainable +- (void)testTextViewTextBeforeTextable { UITextView *textView = UITextView.new; - textView.textAndApplyChainable = @"Hello, world!"; - textView.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textView.bonString = @"Hello, world!"; + textView.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); XCTAssertEqualObjects(textView.attributedText.string, @"Hello, world!"); @@ -153,10 +153,10 @@ - (void)testTextViewTextBeforeChainable BONAssertAttributedStringHasAttributes(textView.attributedText, controlAttributes); } -- (void)testTextViewAttributedTextAfterChainable +- (void)testTextViewAttributedTextAfterTextable { UITextView *textView = UITextView.new; - textView.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textView.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); textView.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; XCTAssertEqualObjects(textView.attributedText.string, @"Hello, world!"); @@ -166,11 +166,11 @@ - (void)testTextViewAttributedTextAfterChainable BONAssertAttributedStringHasAttributes(textView.attributedText, controlAttributes); } -- (void)testTextViewAttributedTextBeforeChainable +- (void)testTextViewAttributedTextBeforeTextable { UITextView *textView = UITextView.new; textView.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; - textView.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textView.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); XCTAssertEqualObjects(textView.attributedText.string, @"Hello, world!"); @@ -188,11 +188,11 @@ - (void)testTextViewAttributedTextBeforeChainable #pragma mark - UITextField -- (void)testTextFieldTextAfterChainable +- (void)testTextFieldTextAfterTextable { UITextField *textField = UITextField.new; - textField.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); - textField.textAndApplyChainable = @"Hello, world!"; + textField.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); + textField.bonString = @"Hello, world!"; XCTAssertEqualObjects(textField.attributedText.string, @"Hello, world!"); @@ -206,11 +206,11 @@ - (void)testTextFieldTextAfterChainable BONAssertAttributedStringHasAttributes(textField.attributedText, controlAttributes); } -- (void)testTextFieldTextBeforeChainable +- (void)testTextFieldTextBeforeTextable { UITextField *textField = UITextField.new; - textField.textAndApplyChainable = @"Hello, world!"; - textField.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textField.bonString = @"Hello, world!"; + textField.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); XCTAssertEqualObjects(textField.attributedText.string, @"Hello, world!"); @@ -224,10 +224,10 @@ - (void)testTextFieldTextBeforeChainable BONAssertAttributedStringHasAttributes(textField.attributedText, controlAttributes); } -- (void)testTextFieldAttributedTextAfterChainable +- (void)testTextFieldAttributedTextAfterTextable { UITextField *textField = UITextField.new; - textField.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textField.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); textField.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; XCTAssertEqualObjects(textField.attributedText.string, @"Hello, world!"); @@ -237,13 +237,13 @@ - (void)testTextFieldAttributedTextAfterChainable BONAssertAttributedStringHasAttributes(textField.attributedText, controlAttributes); } -- (void)testTextFieldAttributedTextBeforeChainable +- (void)testTextFieldAttributedTextBeforeTextable { UITextField *textField = UITextField.new; textField.attributedText = [[NSAttributedString alloc] initWithString:@"Hello, world!"]; - textField.bonChainable = BONChain.new.font([UIFont systemFontOfSize:16]); + textField.bonTextable = BONChain.new.font([UIFont systemFontOfSize:16]); - XCTAssertNotNil(textField.bonChainable); + XCTAssertNotNil(textField.bonTextable); XCTAssertEqualObjects(textField.attributedText.string, @"Hello, world!"); NSMutableDictionary *controlAttributes = BONDefaultAttributesForClassWithString([UITextField class], @"Hello, world!"); diff --git a/Pod/Classes/BONChain.h b/Pod/Classes/BONChain.h index fde4666c..6ce44027 100644 --- a/Pod/Classes/BONChain.h +++ b/Pod/Classes/BONChain.h @@ -43,7 +43,7 @@ typedef BONChain *BONCNonnull (^BONChainUnderlineColor)(UIColor *BONCNullable co typedef BONChain *BONCNonnull (^BONChainStrikethroughStyle)(NSUnderlineStyle style); typedef BONChain *BONCNonnull (^BONChainStrikethroughColor)(UIColor *BONCNullable color); -@interface BONChain : NSObject +@interface BONChain : NSObject @property (copy, nonatomic, readonly) NSAttributedString *attributedString; @property (copy, nonatomic, readonly) BONStringDict *attributes; @@ -93,8 +93,8 @@ typedef BONChain *BONCNonnull (^BONChainStrikethroughColor)(UIColor *BONCNullabl @property (copy, nonatomic, readonly) BONChainStrikethroughColor strikethroughColor; // concatenation -- (void)appendLink:(id)link; -- (void)appendLink:(id)link separator:(BONNullable NSString *)separator; +- (void)appendLink:(id)link; +- (void)appendLink:(id)link separator:(BONNullable NSString *)separator; @end diff --git a/Pod/Classes/BONChain.m b/Pod/Classes/BONChain.m index cbea43ce..31eda898 100644 --- a/Pod/Classes/BONChain.m +++ b/Pod/Classes/BONChain.m @@ -342,12 +342,12 @@ - (BONChainStrikethroughColor)strikethroughColor return [strikethroughColorBlock copy]; } -- (void)appendLink:(id)link +- (void)appendLink:(id)link { [self appendLink:link separator:nil]; } -- (void)appendLink:(id)link separator:(NSString *)separator +- (void)appendLink:(id)link separator:(NSString *)separator { if (separator.length > 0) { // Recursion! diff --git a/Pod/Classes/BONText.h b/Pod/Classes/BONText.h index fa3c2629..b012ff37 100644 --- a/Pod/Classes/BONText.h +++ b/Pod/Classes/BONText.h @@ -8,7 +8,7 @@ @import UIKit; -#import "BONChainable.h" +#import "BONTextable.h" #import "BONCompatibility.h" typedef NS_ENUM(NSUInteger, BONFigureCase) { @@ -25,7 +25,7 @@ typedef NS_ENUM(NSUInteger, BONFigureSpacing) { @class BONText; -@interface BONText : NSObject +@interface BONText : NSObject // Appending diff --git a/Pod/Classes/BONText.m b/Pod/Classes/BONText.m index 9b5fc915..e407a8e0 100644 --- a/Pod/Classes/BONText.m +++ b/Pod/Classes/BONText.m @@ -463,7 +463,7 @@ - (void)setImage:(UIImage *)image } } -#pragma mark - BONChainable +#pragma mark - BONTextable - (BONText *)text { diff --git a/Pod/Classes/BONChainable.h b/Pod/Classes/BONTextable.h similarity index 84% rename from Pod/Classes/BONChainable.h rename to Pod/Classes/BONTextable.h index 6095312a..4fd7e98c 100644 --- a/Pod/Classes/BONChainable.h +++ b/Pod/Classes/BONTextable.h @@ -1,5 +1,5 @@ // -// BONChainable.h +// BONTextable.h // BonMot // // Created by Zev Eisenberg on 10/9/15. @@ -17,7 +17,7 @@ BON_ASSUME_NONNULL_BEGIN /** * Objects conforming to this protocol can be used in BonMot chaining operations. */ -@protocol BONChainable +@protocol BONTextable @property (strong, nonatomic, readonly) BONText *text; diff --git a/Pod/UI/Classes/UILabel+BonMotUtilities.h b/Pod/UI/Classes/UILabel+BonMotUtilities.h index 12ee4a32..1318a265 100644 --- a/Pod/UI/Classes/UILabel+BonMotUtilities.h +++ b/Pod/UI/Classes/UILabel+BonMotUtilities.h @@ -7,21 +7,20 @@ // @import UIKit; -@protocol BONChainable; +@protocol BONTextable; @interface UILabel (BonMotUtilities) /** - * Assign a @p BONChainable object to apply to the label text. When a new value is assigned to @p text the chain attributes will be applied. - * If a new value is assigned directly to @p attributedText the @p bonChainable property will be set to @p nil. + * Assign a @p BONTextable object to apply to the label text. When a new value is assigned to @p bonString the chain attributes will be applied. */ -@property (copy, nonatomic) id bonChainable; +@property (copy, nonatomic) id bonTextable; /** - * Assigning text via this method will apply the chain attributes and set the @p attributedText with the resulting @p NSAttributedString. + * Assigning a string via this method will apply the attributes of any assigned @p BONTextable and set the @p attributedText with the resulting @p NSAttributedString. * - * @param text The text to be displayed. + * @param string The text to be displayed. */ -- (void)setTextAndApplyChainable:(NSString *)text; +- (void)setBonString:(NSString *)string; @end diff --git a/Pod/UI/Classes/UILabel+BonMotUtilities.m b/Pod/UI/Classes/UILabel+BonMotUtilities.m index d16769aa..6b557aaa 100644 --- a/Pod/UI/Classes/UILabel+BonMotUtilities.m +++ b/Pod/UI/Classes/UILabel+BonMotUtilities.m @@ -11,26 +11,26 @@ @implementation UILabel (BonMotUtilities) -- (void)setBonChainable:(id)chainable +- (void)setBonTextable:(id)textable { - objc_setAssociatedObject(self, @selector(bonChainable), chainable, OBJC_ASSOCIATION_COPY_NONATOMIC); + objc_setAssociatedObject(self, @selector(bonTextable), textable, OBJC_ASSOCIATION_COPY_NONATOMIC); - self.textAndApplyChainable = self.text; + self.bonString = self.text; } -- (BONChain *)bonChainable +- (BONChain *)bonTextable { - return objc_getAssociatedObject(self, @selector(bonChainable)); + return objc_getAssociatedObject(self, @selector(bonTextable)); } -- (void)setTextAndApplyChainable:(NSString *)text +- (void)setBonString:(NSString *)string { - if (self.bonChainable) { - self.bonChainable.text.string = text; - self.attributedText = self.bonChainable.text.attributedString; + if (self.bonTextable) { + self.bonTextable.text.string = string; + self.attributedText = self.bonTextable.text.attributedString; } else { - self.text = text; + self.text = string; } } diff --git a/Pod/UI/Classes/UITextField+BonMotUtilities.h b/Pod/UI/Classes/UITextField+BonMotUtilities.h index 77bdfd57..c006e184 100644 --- a/Pod/UI/Classes/UITextField+BonMotUtilities.h +++ b/Pod/UI/Classes/UITextField+BonMotUtilities.h @@ -7,21 +7,20 @@ // @import UIKit; -@protocol BONChainable; +@protocol BONTextable; @interface UITextField (BonMotUtilities) /** - * Assign a @p BONChainable object to apply to the label text. When a new value is assigned to @p text the chain attributes will be applied. - * If a new value is assigned directly to @p attributedText the @p bonChainable property will be set to @p nil. + * Assign a @p BONTextable object to apply to the label text. When a new value is assigned to @p bonString the chain attributes will be applied. */ -@property (copy, nonatomic) id bonChainable; +@property (copy, nonatomic) id bonTextable; /** - * Assigning text via this method will apply the chain attributes and set the @p attributedText with the resulting @p NSAttributedString. + * Assigning a string via this method will apply the attributes of any assigned @p BONTextable and set the @p attributedText with the resulting @p NSAttributedString. * - * @param text The text to be displayed. + * @param string The text to be displayed. */ -- (void)setTextAndApplyChainable:(NSString *)text; +- (void)setBonString:(NSString *)string; @end diff --git a/Pod/UI/Classes/UITextField+BonMotUtilities.m b/Pod/UI/Classes/UITextField+BonMotUtilities.m index e68dbaf9..8644fd84 100644 --- a/Pod/UI/Classes/UITextField+BonMotUtilities.m +++ b/Pod/UI/Classes/UITextField+BonMotUtilities.m @@ -11,26 +11,26 @@ @implementation UITextField (BonMotUtilities) -- (void)setBonChainable:(id)chainable +- (void)setBonTextable:(id)textable { - objc_setAssociatedObject(self, @selector(bonChainable), chainable, OBJC_ASSOCIATION_COPY_NONATOMIC); + objc_setAssociatedObject(self, @selector(bonTextable), textable, OBJC_ASSOCIATION_COPY_NONATOMIC); - self.textAndApplyChainable = self.text; + self.bonString = self.text; } -- (BONChain *)bonChainable +- (BONChain *)bonTextable { - return objc_getAssociatedObject(self, @selector(bonChainable)); + return objc_getAssociatedObject(self, @selector(bonTextable)); } -- (void)setTextAndApplyChainable:(NSString *)text +- (void)setBonString:(NSString *)string { - if (self.bonChainable) { - self.bonChainable.text.string = text; - self.attributedText = self.bonChainable.text.attributedString; + if (self.bonTextable) { + self.bonTextable.text.string = string; + self.attributedText = self.bonTextable.text.attributedString; } else { - self.text = text; + self.text = string; } } diff --git a/Pod/UI/Classes/UITextView+BonMotUtilities.h b/Pod/UI/Classes/UITextView+BonMotUtilities.h index cfdfc1fb..f5fb87e4 100644 --- a/Pod/UI/Classes/UITextView+BonMotUtilities.h +++ b/Pod/UI/Classes/UITextView+BonMotUtilities.h @@ -7,21 +7,20 @@ // @import UIKit; -@protocol BONChainable; +@protocol BONTextable; @interface UITextView (BonMotUtilities) /** - * Assign a @p BONChainable object to apply to the label text. When a new value is assigned to @p text the chain attributes will be applied. - * If a new value is assigned directly to @p attributedText the @p bonChainable property will be set to @p nil. + * Assign a @p BONTextable object to apply to the label text. When a new value is assigned to @p bonString the chain attributes will be applied. */ -@property (copy, nonatomic) id bonChainable; +@property (copy, nonatomic) id bonTextable; /** - * Assigning text via this method will apply the chain attributes and set the @p attributedText with the resulting @p NSAttributedString. + * Assigning a string via this method will apply the attributes of any assigned @p BONTextable and set the @p attributedText with the resulting @p NSAttributedString. * - * @param text The text to be displayed. + * @param string The text to be displayed. */ -- (void)setTextAndApplyChainable:(NSString *)text; +- (void)setBonString:(NSString *)string; @end diff --git a/Pod/UI/Classes/UITextView+BonMotUtilities.m b/Pod/UI/Classes/UITextView+BonMotUtilities.m index 3d0642b6..d22d2911 100644 --- a/Pod/UI/Classes/UITextView+BonMotUtilities.m +++ b/Pod/UI/Classes/UITextView+BonMotUtilities.m @@ -11,26 +11,26 @@ @implementation UITextView (BonMotUtilities) -- (void)setBonChainable:(id)chainable +- (void)setBonTextable:(id)textable { - objc_setAssociatedObject(self, @selector(bonChainable), chainable, OBJC_ASSOCIATION_COPY_NONATOMIC); + objc_setAssociatedObject(self, @selector(bonTextable), textable, OBJC_ASSOCIATION_COPY_NONATOMIC); - self.textAndApplyChainable = self.text; + self.bonString = self.text; } -- (BONChain *)bonChainable +- (BONChain *)bonTextable { - return objc_getAssociatedObject(self, @selector(bonChainable)); + return objc_getAssociatedObject(self, @selector(bonTextable)); } -- (void)setTextAndApplyChainable:(NSString *)text +- (void)setBonString:(NSString *)string { - if (self.bonChainable) { - self.bonChainable.text.string = text; - self.attributedText = self.bonChainable.text.attributedString; + if (self.bonTextable) { + self.bonTextable.text.string = string; + self.attributedText = self.bonTextable.text.attributedString; } else { - self.text = text; + self.text = string; } } diff --git a/README.md b/README.md index d0e11015..d2b0bb59 100644 --- a/README.md +++ b/README.md @@ -114,15 +114,15 @@ NSAttributedString *blueBirdString = blueBirds.attributedString; ## Label, TextView, and TextField Utilities -BonMot provides a `bonChainable` property on `UILabel`, `UITextView`, and `UITextField` that allows assigning a `BONChainable` object to apply styling to the `text` property in a similar way as the `font` property. +BonMot provides a `bonTextable` property on `UILabel`, `UITextView`, and `UITextField` that allows assigning a `BONTextable` object to apply styling to any strings assigned via the `bonString` property. ```objc UILabel *label = [[UILabel alloc] init]; BONChain *chain = BONChain.new.adobeTracking(300).fontNameAndSize(@"Avenir-Book", 18.0f); -label.bonChainable = chain; -label.text = @"Some initial text."; +label.bonTextable = chain; +label.bonString = @"Some initial text."; ``` Outputs: @@ -139,8 +139,6 @@ Outputs: -**Warning:** Using the `attributedText` property directly is unsupported when an assignment has been made to the `bonChainable` property. Assigning a value to this property will `nil` the `bonChainable` property. - ## Concatenation You can concatenate an array of `BONText`s: