diff --git a/Peacock.xcodeproj/project.pbxproj b/Peacock.xcodeproj/project.pbxproj index 6e83f96..2b46e43 100644 --- a/Peacock.xcodeproj/project.pbxproj +++ b/Peacock.xcodeproj/project.pbxproj @@ -11,10 +11,7 @@ CD2C08021AC3741200E5C412 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CD2C08011AC3741200E5C412 /* main.m */; }; CD2C08051AC3741200E5C412 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CD2C08041AC3741200E5C412 /* AppDelegate.m */; }; CD2C08081AC3741200E5C412 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD2C08071AC3741200E5C412 /* ViewController.m */; }; - CD2C080B1AC3741200E5C412 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD2C08091AC3741200E5C412 /* Main.storyboard */; }; CD2C080D1AC3741200E5C412 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD2C080C1AC3741200E5C412 /* Images.xcassets */; }; - CD2C08101AC3741200E5C412 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD2C080E1AC3741200E5C412 /* LaunchScreen.xib */; }; - CD2C081C1AC3741200E5C412 /* PeacockAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD2C081B1AC3741200E5C412 /* PeacockAppTests.m */; }; CD54BAA91ACA0274008F9909 /* LYPeacockTableTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD54BAA81ACA0274008F9909 /* LYPeacockTableTests.m */; }; CD59FEC71AACDA0900FB8D9E /* libPeacock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD59FEBB1AACDA0900FB8D9E /* libPeacock.a */; }; CD6BA0021ACA078400602D72 /* LYPeacockTextFieldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD6BA0011ACA078400602D72 /* LYPeacockTextFieldTests.m */; }; @@ -25,11 +22,8 @@ CDA32C681AC71BE000A199C1 /* LYPeacockNavigationBarTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA32C671AC71BE000A199C1 /* LYPeacockNavigationBarTests.m */; }; CDA8A5C91AAD0CEE007EAC99 /* UIButton+LYAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5AA1AAD0CEE007EAC99 /* UIButton+LYAppearance.m */; }; CDA8A5CA1AAD0CEE007EAC99 /* UIButton+LYAttributedButton.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5AC1AAD0CEE007EAC99 /* UIButton+LYAttributedButton.m */; }; - CDA8A5CB1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5AF1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.m */; }; CDA8A5CC1AAD0CEE007EAC99 /* UILabel+FontAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5B11AAD0CEE007EAC99 /* UILabel+FontAppearance.m */; }; CDA8A5CD1AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5B31AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.m */; }; - CDA8A5CE1AAD0CEE007EAC99 /* UILabel+SizeToFitText.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5B51AAD0CEE007EAC99 /* UILabel+SizeToFitText.m */; }; - CDA8A5CF1AAD0CEE007EAC99 /* UILabel+VerticalAlignText.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5B71AAD0CEE007EAC99 /* UILabel+VerticalAlignText.m */; }; CDA8A5D01AAD0CEE007EAC99 /* UINavigationBar+LYTranlucenceUIAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5BA1AAD0CEE007EAC99 /* UINavigationBar+LYTranlucenceUIAppearance.m */; }; CDA8A5D11AAD0CEE007EAC99 /* UITableView+SeparatorUIAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5BD1AAD0CEE007EAC99 /* UITableView+SeparatorUIAppearance.m */; }; CDA8A5D21AAD0CEE007EAC99 /* UITextField+LYAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = CDA8A5C01AAD0CEE007EAC99 /* UITextField+LYAppearance.m */; }; @@ -40,13 +34,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - CD2C08161AC3741200E5C412 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = CD59FEB31AACDA0900FB8D9E /* Project object */; - proxyType = 1; - remoteGlobalIDString = CD2C07FC1AC3741200E5C412; - remoteInfo = PeacockApp; - }; CD2C08231AC3742000E5C412 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CD59FEB31AACDA0900FB8D9E /* Project object */; @@ -85,12 +72,7 @@ CD2C08041AC3741200E5C412 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; CD2C08061AC3741200E5C412 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; CD2C08071AC3741200E5C412 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - CD2C080A1AC3741200E5C412 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; CD2C080C1AC3741200E5C412 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - CD2C080F1AC3741200E5C412 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - CD2C08151AC3741200E5C412 /* PeacockAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeacockAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - CD2C081A1AC3741200E5C412 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CD2C081B1AC3741200E5C412 /* PeacockAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PeacockAppTests.m; sourceTree = ""; }; CD54BAA81ACA0274008F9909 /* LYPeacockTableTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LYPeacockTableTests.m; sourceTree = ""; }; CD59FEBB1AACDA0900FB8D9E /* libPeacock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPeacock.a; sourceTree = BUILT_PRODUCTS_DIR; }; CD59FEC61AACDA0900FB8D9E /* PeacockTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeacockTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -106,16 +88,10 @@ CDA8A5AA1AAD0CEE007EAC99 /* UIButton+LYAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+LYAppearance.m"; sourceTree = ""; }; CDA8A5AB1AAD0CEE007EAC99 /* UIButton+LYAttributedButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+LYAttributedButton.h"; sourceTree = ""; }; CDA8A5AC1AAD0CEE007EAC99 /* UIButton+LYAttributedButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+LYAttributedButton.m"; sourceTree = ""; }; - CDA8A5AE1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LYUILabelWithVerticalScrollAnimationOnSetText.h; sourceTree = ""; }; - CDA8A5AF1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LYUILabelWithVerticalScrollAnimationOnSetText.m; sourceTree = ""; }; CDA8A5B01AAD0CEE007EAC99 /* UILabel+FontAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+FontAppearance.h"; sourceTree = ""; }; CDA8A5B11AAD0CEE007EAC99 /* UILabel+FontAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+FontAppearance.m"; sourceTree = ""; }; CDA8A5B21AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+LYAttributedLabel.h"; sourceTree = ""; }; CDA8A5B31AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+LYAttributedLabel.m"; sourceTree = ""; }; - CDA8A5B41AAD0CEE007EAC99 /* UILabel+SizeToFitText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+SizeToFitText.h"; sourceTree = ""; }; - CDA8A5B51AAD0CEE007EAC99 /* UILabel+SizeToFitText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+SizeToFitText.m"; sourceTree = ""; }; - CDA8A5B61AAD0CEE007EAC99 /* UILabel+VerticalAlignText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+VerticalAlignText.h"; sourceTree = ""; }; - CDA8A5B71AAD0CEE007EAC99 /* UILabel+VerticalAlignText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+VerticalAlignText.m"; sourceTree = ""; }; CDA8A5B91AAD0CEE007EAC99 /* UINavigationBar+LYTranlucenceUIAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UINavigationBar+LYTranlucenceUIAppearance.h"; sourceTree = ""; }; CDA8A5BA1AAD0CEE007EAC99 /* UINavigationBar+LYTranlucenceUIAppearance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationBar+LYTranlucenceUIAppearance.m"; sourceTree = ""; }; CDA8A5BC1AAD0CEE007EAC99 /* UITableView+SeparatorUIAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITableView+SeparatorUIAppearance.h"; sourceTree = ""; }; @@ -139,13 +115,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CD2C08121AC3741200E5C412 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; CD59FEB81AACDA0900FB8D9E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -189,9 +158,7 @@ CD2C08041AC3741200E5C412 /* AppDelegate.m */, CD2C08061AC3741200E5C412 /* ViewController.h */, CD2C08071AC3741200E5C412 /* ViewController.m */, - CD2C08091AC3741200E5C412 /* Main.storyboard */, CD2C080C1AC3741200E5C412 /* Images.xcassets */, - CD2C080E1AC3741200E5C412 /* LaunchScreen.xib */, CD2C07FF1AC3741200E5C412 /* Supporting Files */, ); path = PeacockApp; @@ -206,30 +173,12 @@ name = "Supporting Files"; sourceTree = ""; }; - CD2C08181AC3741200E5C412 /* PeacockAppTests */ = { - isa = PBXGroup; - children = ( - CD2C081B1AC3741200E5C412 /* PeacockAppTests.m */, - CD2C08191AC3741200E5C412 /* Supporting Files */, - ); - path = PeacockAppTests; - sourceTree = ""; - }; - CD2C08191AC3741200E5C412 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - CD2C081A1AC3741200E5C412 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; CD59FEB21AACDA0900FB8D9E = { isa = PBXGroup; children = ( CD59FEBD1AACDA0900FB8D9E /* Peacock */, CD59FECA1AACDA0900FB8D9E /* PeacockTests */, CD2C07FE1AC3741200E5C412 /* PeacockApp */, - CD2C08181AC3741200E5C412 /* PeacockAppTests */, CD59FEBC1AACDA0900FB8D9E /* Products */, BF9D8D77AEE2531A48941B8A /* Pods */, 1DA6252F298EC86FDEADEF90 /* Frameworks */, @@ -242,7 +191,6 @@ CD59FEBB1AACDA0900FB8D9E /* libPeacock.a */, CD59FEC61AACDA0900FB8D9E /* PeacockTests.xctest */, CD2C07FD1AC3741200E5C412 /* PeacockApp.app */, - CD2C08151AC3741200E5C412 /* PeacockAppTests.xctest */, ); name = Products; sourceTree = ""; @@ -309,16 +257,10 @@ CDA8A5AD1AAD0CEE007EAC99 /* UILabel */ = { isa = PBXGroup; children = ( - CDA8A5AE1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.h */, - CDA8A5AF1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.m */, CDA8A5B01AAD0CEE007EAC99 /* UILabel+FontAppearance.h */, CDA8A5B11AAD0CEE007EAC99 /* UILabel+FontAppearance.m */, CDA8A5B21AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.h */, CDA8A5B31AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.m */, - CDA8A5B41AAD0CEE007EAC99 /* UILabel+SizeToFitText.h */, - CDA8A5B51AAD0CEE007EAC99 /* UILabel+SizeToFitText.m */, - CDA8A5B61AAD0CEE007EAC99 /* UILabel+VerticalAlignText.h */, - CDA8A5B71AAD0CEE007EAC99 /* UILabel+VerticalAlignText.m */, ); path = UILabel; sourceTree = ""; @@ -388,24 +330,6 @@ productReference = CD2C07FD1AC3741200E5C412 /* PeacockApp.app */; productType = "com.apple.product-type.application"; }; - CD2C08141AC3741200E5C412 /* PeacockAppTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = CD2C08221AC3741200E5C412 /* Build configuration list for PBXNativeTarget "PeacockAppTests" */; - buildPhases = ( - CD2C08111AC3741200E5C412 /* Sources */, - CD2C08121AC3741200E5C412 /* Frameworks */, - CD2C08131AC3741200E5C412 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - CD2C08171AC3741200E5C412 /* PBXTargetDependency */, - ); - name = PeacockAppTests; - productName = PeacockAppTests; - productReference = CD2C08151AC3741200E5C412 /* PeacockAppTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; CD59FEBA1AACDA0900FB8D9E /* Peacock */ = { isa = PBXNativeTarget; buildConfigurationList = CD59FECF1AACDA0900FB8D9E /* Build configuration list for PBXNativeTarget "Peacock" */; @@ -456,10 +380,6 @@ CD2C07FC1AC3741200E5C412 = { CreatedOnToolsVersion = 6.2; }; - CD2C08141AC3741200E5C412 = { - CreatedOnToolsVersion = 6.2; - TestTargetID = CD2C07FC1AC3741200E5C412; - }; CD59FEBA1AACDA0900FB8D9E = { CreatedOnToolsVersion = 6.1.1; }; @@ -485,7 +405,6 @@ CD59FEBA1AACDA0900FB8D9E /* Peacock */, CD59FEC51AACDA0900FB8D9E /* PeacockTests */, CD2C07FC1AC3741200E5C412 /* PeacockApp */, - CD2C08141AC3741200E5C412 /* PeacockAppTests */, ); }; /* End PBXProject section */ @@ -495,19 +414,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - CD2C080B1AC3741200E5C412 /* Main.storyboard in Resources */, - CD2C08101AC3741200E5C412 /* LaunchScreen.xib in Resources */, CD2C080D1AC3741200E5C412 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - CD2C08131AC3741200E5C412 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; CD59FEC41AACDA0900FB8D9E /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -561,27 +471,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - CD2C08111AC3741200E5C412 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - CD2C081C1AC3741200E5C412 /* PeacockAppTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; CD59FEB71AACDA0900FB8D9E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CDA8A5CB1AAD0CEE007EAC99 /* LYUILabelWithVerticalScrollAnimationOnSetText.m in Sources */, - CDA8A5CF1AAD0CEE007EAC99 /* UILabel+VerticalAlignText.m in Sources */, CDA8A5CA1AAD0CEE007EAC99 /* UIButton+LYAttributedButton.m in Sources */, CDA8A5D01AAD0CEE007EAC99 /* UINavigationBar+LYTranlucenceUIAppearance.m in Sources */, CDA8A5CD1AAD0CEE007EAC99 /* UILabel+LYAttributedLabel.m in Sources */, CDA8A5D11AAD0CEE007EAC99 /* UITableView+SeparatorUIAppearance.m in Sources */, CDA8A5C91AAD0CEE007EAC99 /* UIButton+LYAppearance.m in Sources */, CDA8A5D21AAD0CEE007EAC99 /* UITextField+LYAppearance.m in Sources */, - CDA8A5CE1AAD0CEE007EAC99 /* UILabel+SizeToFitText.m in Sources */, CDA8A5D31AAD0CEE007EAC99 /* UITextView+LYAppearance.m in Sources */, CDA8A5D41AAD0CEE007EAC99 /* UIViewController+AttributedStringTitle.m in Sources */, CD85FC841AAE58B2000B1318 /* LYCGFloatSizeHelper.m in Sources */, @@ -607,11 +506,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - CD2C08171AC3741200E5C412 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CD2C07FC1AC3741200E5C412 /* PeacockApp */; - targetProxy = CD2C08161AC3741200E5C412 /* PBXContainerItemProxy */; - }; CD2C08241AC3742000E5C412 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = CD2C07FC1AC3741200E5C412 /* PeacockApp */; @@ -624,25 +518,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - CD2C08091AC3741200E5C412 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - CD2C080A1AC3741200E5C412 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - CD2C080E1AC3741200E5C412 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - CD2C080F1AC3741200E5C412 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ CD2C081D1AC3741200E5C412 /* Debug */ = { isa = XCBuildConfiguration; @@ -675,43 +550,6 @@ }; name = Release; }; - CD2C081F1AC3741200E5C412 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = PeacockAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PeacockApp.app/PeacockApp"; - }; - name = Debug; - }; - CD2C08201AC3741200E5C412 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = PeacockAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PeacockApp.app/PeacockApp"; - }; - name = Release; - }; CD59FECD1AACDA0900FB8D9E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -852,15 +690,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - CD2C08221AC3741200E5C412 /* Build configuration list for PBXNativeTarget "PeacockAppTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CD2C081F1AC3741200E5C412 /* Debug */, - CD2C08201AC3741200E5C412 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; CD59FEB61AACDA0900FB8D9E /* Build configuration list for PBXProject "Peacock" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.h b/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.h deleted file mode 100644 index e49c973..0000000 --- a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.h +++ /dev/null @@ -1,10 +0,0 @@ -// -// Created by Michael May on 26/06/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import - -@interface LYUILabelWithVerticalScrollAnimationOnSetText : UILabel - -@end diff --git a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.m b/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.m deleted file mode 100644 index 76ef3a4..0000000 --- a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.m +++ /dev/null @@ -1,52 +0,0 @@ -// -// Created by Michael May on 26/06/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import "LYUILabelWithVerticalScrollAnimationOnSetText.h" - -@interface LYUILabelWithVerticalScrollAnimationOnSetText () -@property (nonatomic, strong) NSTimer *timer; -@property (nonatomic, assign) CGFloat animationYOffset; -@end - -@implementation LYUILabelWithVerticalScrollAnimationOnSetText - -- (void)drawTextInRect:(CGRect)rect -{ - CGRect textRect = rect; - textRect.origin.y += self.animationYOffset; - - [super drawTextInRect:textRect]; -} - --(void)animateUp:(NSTimer*)timer -{ - if(self.superview == nil) { - [timer invalidate]; - return; - } - - if(self.animationYOffset <= 0.0f) { - [timer invalidate]; - return; - } - - self.animationYOffset -= 1.0f; - [self setNeedsDisplay]; -} - --(void)setAttributedText:(NSAttributedString *)attributedText -{ - [super setAttributedText:attributedText]; - - self.animationYOffset = self.font.lineHeight; - - dispatch_async(dispatch_get_main_queue(),(^{ - CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(animateUp:)]; - [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; - })); - -} - -@end diff --git a/Peacock/UILabel/UILabel+LYAttributedLabel.h b/Peacock/UILabel/UILabel+LYAttributedLabel.h index 10350de..f3515e2 100644 --- a/Peacock/UILabel/UILabel+LYAttributedLabel.h +++ b/Peacock/UILabel/UILabel+LYAttributedLabel.h @@ -7,10 +7,6 @@ @interface UILabel (LYAttributedLabel) -// these are deprecated see, #import "UILabel+FontAppearance.h" -@property (nonatomic, copy) UIColor* LYTextColor UI_APPEARANCE_SELECTOR; -@property (nonatomic, copy) UIFont* LYFont UI_APPEARANCE_SELECTOR; - @property (nonatomic, assign) NSLineBreakMode LYLineBreakMode UI_APPEARANCE_SELECTOR; @property (nonatomic, assign) NSTextAlignment LYTextAlignment UI_APPEARANCE_SELECTOR; diff --git a/Peacock/UILabel/UILabel+SizeToFitText.h b/Peacock/UILabel/UILabel+SizeToFitText.h deleted file mode 100644 index e8dfc6e..0000000 --- a/Peacock/UILabel/UILabel+SizeToFitText.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Created by Michael May on 13/01/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import - -static const CGFloat LYSizeToFitTextAttributedLineSpacingDefault = 0.0f; - -@interface UILabel (SizeToFitText) - --(void)LYSizeToFitText; --(CGSize)LYGetSizeToFitText; - -+(CGRect)LYRectToFitText:(NSString*)text - frame:(CGRect)frame - autoresizingMask:(UIViewAutoresizing)autoresizingMask - font:(UIFont*)font - lineBreakMode:(NSLineBreakMode)lineBreakMode - lineSpacing:(CGFloat)lineSpacing; - - -+(CGSize)LYSizeToFitSize:(CGSize)constrainedSize - text:(NSString*)text - font:(UIFont*)font - lineBreakMode:(NSLineBreakMode)lineBreakMode - lineSpacing:(CGFloat)lineSpacing; - -+(CGRect)LYRectToFitText:(NSString *)text - currentFrame:(CGRect)currentFrame - autoresizingMask:(UIViewAutoresizing)autoresizingMask - appearance:(id)appearance; - -+(CGSize)sizeForText:(NSString*)text - font:(UIFont*)font - constrainedToWidth:(CGFloat)totalWidth - lineSpacing:(CGFloat)lineSpacing; - --(CGSize)LYSizeWithFont; - --(CGSize)LYSizeToFitSize:(CGSize)constrainedSize; --(CGSize)LYSizeToFitSize:(CGSize)constrainedSize lineSpacing:(CGFloat) lineSpacing; - --(void)LYAdjustFrameSizeToFitAttributedText; - --(CGSize)LYGetSizeToFitAttributedTextWithSize:(CGSize) optionalSize; - -@end diff --git a/Peacock/UILabel/UILabel+SizeToFitText.m b/Peacock/UILabel/UILabel+SizeToFitText.m deleted file mode 100644 index 4a821b4..0000000 --- a/Peacock/UILabel/UILabel+SizeToFitText.m +++ /dev/null @@ -1,212 +0,0 @@ -// -// Created by Michael May on 13/01/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import - -#import "LYCGFloatSizeHelper.h" - -#import "UILabel+SizeToFitText.h" -#import "UILabel+LYAttributedLabel.h" -#import "UILabel+FontAppearance.h" - -@implementation UILabel (SizeToFitText) - --(CGSize)LYSizeWithFont -{ - NSString *title = [self text]; - UIFont *font = [self font]; - - NSDictionary *attributes = @{NSFontAttributeName : font}; - CGSize size = [title sizeWithAttributes:attributes]; - - size.width = ceil64Helper(size.width); - size.height = ceil64Helper(size.height); - - return size; -} - --(CGSize)LYSizeToFitSize:(CGSize)constrainedSize -{ - return [UILabel LYSizeToFitSize:constrainedSize - text:[self text] - font:[self font] - lineBreakMode:[self lineBreakMode] - lineSpacing:LYSizeToFitTextAttributedLineSpacingDefault]; -} - --(CGSize)LYSizeToFitSize:(CGSize)constrainedSize lineSpacing:(CGFloat) lineSpacing -{ - CGRect frame = CGRectZero; - frame.size = constrainedSize; - frame = [UILabel LYRectToFitText:self.text - frame:frame - autoresizingMask:UIViewAutoresizingFlexibleHeight - font:[self font] - lineBreakMode:NSLineBreakByWordWrapping - lineSpacing:lineSpacing]; - return frame.size; -} - --(void)LYSizeToFitText -{ - CGRect frame = [UILabel LYRectToFitText:[self text] - frame:[self frame] - autoresizingMask:[self autoresizingMask] - font:[self font] - lineBreakMode:[self lineBreakMode] - lineSpacing:LYSizeToFitTextAttributedLineSpacingDefault]; - - [self setFrame:frame]; -} - --(CGSize)LYGetSizeToFitText -{ - CGRect frame = [UILabel LYRectToFitText:[self text] - frame:[self frame] - autoresizingMask:[self autoresizingMask] - font:[self font] - lineBreakMode:[self lineBreakMode] - lineSpacing:LYSizeToFitTextAttributedLineSpacingDefault]; - - return frame.size; -} - --(void)LYAdjustFrameSizeToFitAttributedText -{ - CGRect frame = [UILabel LYRectToFitText:[self text] - frame:[self frame] - autoresizingMask:[self autoresizingMask] - font:[self font] - lineBreakMode:[self lineBreakMode] - lineSpacing:[self LYLineSpacing]]; - [self setFrame:frame]; -} - --(CGSize)LYGetSizeToFitAttributedTextWithSize:(CGSize) optionalSize -{ - CGSize calculatedSize = [UILabel LYSizeToFitSize:optionalSize - text:[self text] - font:[self font] - lineBreakMode:[self lineBreakMode] - lineSpacing:[self LYLineSpacing]]; - return calculatedSize; -} - - -#pragma mark - - -+(CGSize)LYSizeToFitSize:(CGSize)constrainedSize - text:(NSString*)text - font:(UIFont*)font - lineBreakMode:(NSLineBreakMode)lineBreakMode - lineSpacing:(CGFloat)lineSpacing - -{ - CGSize size = CGSizeZero; - - NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; - [paragraphStyle setAlignment:NSTextAlignmentLeft]; - [paragraphStyle setLineBreakMode:lineBreakMode]; - [paragraphStyle setLineSpacing:lineSpacing]; - - // crashes at this point are most commonly caused by not having UIAppearance applied - CGRect rect = [text boundingRectWithSize:constrainedSize - options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading - attributes:@{NSFontAttributeName : font, - NSParagraphStyleAttributeName : paragraphStyle} - context:nil]; - - size = rect.size; - - size.width = ceil64Helper(size.width); - size.height = ceil64Helper(size.height); - - return size; -} - -+(CGRect)LYRectToFitText:(NSString *)text - currentFrame:(CGRect)currentFrame - autoresizingMask:(UIViewAutoresizing)autoresizingMask - appearance:(id)appearance -{ - UIFont *font = nil; - font = [appearance appearanceFont]; - - if(font == nil) { - font = [appearance LYFont]; - } - - CGFloat lineSpacing = [appearance appearanceLineSpacingParagraphStyle]; - if(lineSpacing == 0.0f) { - lineSpacing = [appearance LYLineSpacing]; - } - - NSLineBreakMode lineBreakMode = [appearance LYLineBreakMode]; - - CGRect calculatedFrame = [self LYRectToFitText:text - frame:currentFrame - autoresizingMask:autoresizingMask - font:font - lineBreakMode:lineBreakMode - lineSpacing:lineSpacing]; - - return calculatedFrame; -} - -+(CGRect)LYRectToFitText:(NSString*)text - frame:(CGRect)frame - autoresizingMask:(UIViewAutoresizing)autoresizingMask - font:(UIFont*)font - lineBreakMode:(NSLineBreakMode)lineBreakMode - lineSpacing:(CGFloat)lineSpacing -{ - static const CGFloat LYRectToFitTextMaxWidthHeight = 4096; - - CGSize constrainedSize = CGSizeMake(frame.size.width, frame.size.height); - - if((autoresizingMask & UIViewAutoresizingFlexibleWidth) == UIViewAutoresizingFlexibleWidth) { - constrainedSize.width = LYRectToFitTextMaxWidthHeight; - } - - if((autoresizingMask & UIViewAutoresizingFlexibleHeight) == UIViewAutoresizingFlexibleHeight) { - constrainedSize.height = LYRectToFitTextMaxWidthHeight; - } - - frame.size = [self LYSizeToFitSize:constrainedSize - text:text - font:font - lineBreakMode:lineBreakMode - lineSpacing:lineSpacing]; - - if((autoresizingMask & UIViewAutoresizingFlexibleWidth) != UIViewAutoresizingFlexibleWidth) { - frame.size.width = constrainedSize.width; - } - - if((autoresizingMask & UIViewAutoresizingFlexibleHeight) != UIViewAutoresizingFlexibleHeight) { - frame.size.height = constrainedSize.height; - } - - return frame; -} - -+(CGSize)sizeForText:(NSString*)text - font:(UIFont*)font - constrainedToWidth:(CGFloat)totalWidth - lineSpacing:(CGFloat)lineSpacing -{ - CGRect frame = CGRectZero; - frame.size = CGSizeMake(totalWidth, 0.0f); - - frame = [UILabel LYRectToFitText:text - frame:frame - autoresizingMask:UIViewAutoresizingFlexibleHeight - font:font - lineBreakMode:NSLineBreakByWordWrapping - lineSpacing:lineSpacing]; - - return frame.size; -} - -@end diff --git a/Peacock/UILabel/UILabel+VerticalAlignText.h b/Peacock/UILabel/UILabel+VerticalAlignText.h deleted file mode 100644 index 97744b2..0000000 --- a/Peacock/UILabel/UILabel+VerticalAlignText.h +++ /dev/null @@ -1,12 +0,0 @@ -// -// Created by Raimon Lapuente on 01/04/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import - -@interface UILabel (VerticalAlignText) - -- (void) setText:(NSString *) text withBaselineOffset:(CGFloat) offset; - -@end diff --git a/Peacock/UILabel/UILabel+VerticalAlignText.m b/Peacock/UILabel/UILabel+VerticalAlignText.m deleted file mode 100644 index 57e7e33..0000000 --- a/Peacock/UILabel/UILabel+VerticalAlignText.m +++ /dev/null @@ -1,32 +0,0 @@ -// -// Created by Raimon Lapuente on 01/04/2014. -// Copyright (c) 2014 Lyst. All rights reserved. -// - -#import "UILabel+VerticalAlignText.h" -#import "tgmath.h" - -@implementation UILabel (VerticalAlignText) - -- (void) setText:(NSString *) text withBaselineOffset:(CGFloat) offset -{ - if (text == nil) {return;} - - NSDictionary *offsetAttrbute = @{ NSBaselineOffsetAttributeName : @(offset)}; - [self setText:text withAttributes:offsetAttrbute]; -} - -- (void) setText:(NSString *)text withAttributes:(NSDictionary *)offset -{ - if (text == nil) { - return; - } else if (offset == nil) { - [self setText:text]; - } else { - NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:text]; - [str addAttributes:offset range:NSMakeRange(0, str.length)]; - [self setAttributedText:str]; - } -} - -@end diff --git a/Peacock/UIViewController/UIViewController+AttributedStringTitle.h b/Peacock/UIViewController/UIViewController+AttributedStringTitle.h index fcc0082..b137431 100644 --- a/Peacock/UIViewController/UIViewController+AttributedStringTitle.h +++ b/Peacock/UIViewController/UIViewController+AttributedStringTitle.h @@ -5,15 +5,6 @@ #import -@interface UIViewController (AttributedStringTitle) -// this is deprecated --(void)setAttributedTitle:(NSString*)titleText; - -// use this now, after having set the title --(void)setAttributedTitle; -@end - - @interface UIViewController (AttributedStringTitleExtensions) // you should rarely, if ever, need this; it's for other classes to build out from -(void)setAttributedTitle:(NSString*)titleText usingLabel:(UILabel*)titleView; diff --git a/Peacock/UIViewController/UIViewController+AttributedStringTitle.m b/Peacock/UIViewController/UIViewController+AttributedStringTitle.m index efc350e..36ef080 100644 --- a/Peacock/UIViewController/UIViewController+AttributedStringTitle.m +++ b/Peacock/UIViewController/UIViewController+AttributedStringTitle.m @@ -39,22 +39,6 @@ -(UILabel*)createTitleViewLabel return titleView; } --(void)setAttributedTitle:(NSString*)titleText -{ - UILabel *titleView = [self createTitleViewLabel]; - - [self setAttributedTitle:titleText usingLabel:titleView]; -} - --(void)setAttributedTitle -{ - NSString *title = [self title]; - - if(title) { - [self setAttributedTitle:title]; - } -} - #pragma mark - testing -(UILabel *)setAttributedTitleForTesting diff --git a/PeacockApp/Base.lproj/LaunchScreen.xib b/PeacockApp/Base.lproj/LaunchScreen.xib deleted file mode 100644 index f03898d..0000000 --- a/PeacockApp/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PeacockApp/Base.lproj/Main.storyboard b/PeacockApp/Base.lproj/Main.storyboard deleted file mode 100644 index f56d2f3..0000000 --- a/PeacockApp/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PeacockApp/Info.plist b/PeacockApp/Info.plist index d38ec33..396907a 100644 --- a/PeacockApp/Info.plist +++ b/PeacockApp/Info.plist @@ -24,8 +24,6 @@ UILaunchStoryboardName LaunchScreen - UIMainStoryboardFile - Main UIRequiredDeviceCapabilities armv7 diff --git a/PeacockApp/ViewController.m b/PeacockApp/ViewController.m index dacc3c4..7fed0d1 100644 --- a/PeacockApp/ViewController.m +++ b/PeacockApp/ViewController.m @@ -19,9 +19,4 @@ - (void)viewDidLoad { // Do any additional setup after loading the view, typically from a nib. } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - @end diff --git a/PeacockAppTests/Info.plist b/PeacockAppTests/Info.plist deleted file mode 100644 index a2be3bd..0000000 --- a/PeacockAppTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.lyst.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/PeacockAppTests/PeacockAppTests.m b/PeacockAppTests/PeacockAppTests.m deleted file mode 100644 index be9febf..0000000 --- a/PeacockAppTests/PeacockAppTests.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// PeacockAppTests.m -// PeacockAppTests -// -// Created by Raimon Lapuente on 25/3/15. -// Copyright (c) 2015 Lyst. All rights reserved. -// - -#import -#import - -@interface PeacockAppTests : XCTestCase - -@end - -@implementation PeacockAppTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // This is an example of a functional test case. - XCTAssert(YES, @"Pass"); -} - -- (void)testPerformanceExample { - // This is an example of a performance test case. - [self measureBlock:^{ - // Put the code you want to measure the time of here. - }]; -} - -@end diff --git a/PeacockTests/LYPeacockUIViewControllerTests.m b/PeacockTests/LYPeacockUIViewControllerTests.m index 24203be..2e6fc6e 100644 --- a/PeacockTests/LYPeacockUIViewControllerTests.m +++ b/PeacockTests/LYPeacockUIViewControllerTests.m @@ -37,7 +37,7 @@ -(void)setUp { -(void)testThatWeCanSetTitleForUIViewController { //given - [[UILabel appearance] setLYFont:[UIFont fontWithName:self.helveticaUltraLight size:20.0f]]; + [[UILabel appearance] setAppearanceFont:[UIFont fontWithName:self.helveticaUltraLight size:20.0f]]; //when [self.window makeKeyAndVisible];