diff --git a/GraphKit/Example/ExampleBarGraphVC.m b/GraphKit/Example/ExampleBarGraphVC.m index 763f3d1..0f67ba8 100644 --- a/GraphKit/Example/ExampleBarGraphVC.m +++ b/GraphKit/Example/ExampleBarGraphVC.m @@ -33,6 +33,10 @@ - (void)viewDidLoad { // self.graphView.barHeight = 140; // self.graphView.marginBar = 25; // self.graphView.animationDuration = 2.0; + + // Added Ability to customise the Font Color, Font Size or Font Name +// [self.graphView setCustomFontName:@"Gotham-Book"]; +// [self.graphView setCustomFontColor:[UIColor redColor]]; self.graphView.dataSource = self; diff --git a/GraphKit/Example/ExampleLineGraph.m b/GraphKit/Example/ExampleLineGraph.m index 2f1cc97..7948e9f 100644 --- a/GraphKit/Example/ExampleLineGraph.m +++ b/GraphKit/Example/ExampleLineGraph.m @@ -39,13 +39,21 @@ - (void)_setupExampleGraph { // @[@620, @650, @580, @620, @540, @400, @0] ]; - self.labels = @[@"2001", @"2002", @"2003", @"2004", @"2005", @"2006", @"2007"]; + self.labels = @[@"2001", @"", @"", @"2004", @"", @"", @"2007"]; self.graph.dataSource = self; self.graph.lineWidth = 3.0; self.graph.valueLabelCount = 6; + // Added Ability to customise the Font Color, Font Size or Font Name +// [self.graph setXAxisCustomFontName:@"Gotham-Book"]; +// [self.graph setYAxisCustomFontName:@"Arial-ItalicMT"]; +// [self.graph setXAxisCustomFontColor:[UIColor redColor]]; +// [self.graph setYAxisCustomFontColor:[UIColor purpleColor]]; +// [self.graph setXAxisCustomFontSize:6]; +// [self.graph setYAxisCustomFontSize:10]; + [self.graph draw]; } diff --git a/GraphKit/Podfile.lock b/GraphKit/Podfile.lock index 26f909c..15777b0 100644 --- a/GraphKit/Podfile.lock +++ b/GraphKit/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: FrameAccessor: 5eec95b29b5e9a3afe72a7a2e9ed25b000d3bcc3 MKFoundationKit: 4858fe474ee45f988db5ff1e229d700743e71ed8 -COCOAPODS: 0.34.1 +COCOAPODS: 0.35.0 diff --git a/GraphKit/Pods/Manifest.lock b/GraphKit/Pods/Manifest.lock index 26f909c..15777b0 100644 --- a/GraphKit/Pods/Manifest.lock +++ b/GraphKit/Pods/Manifest.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: FrameAccessor: 5eec95b29b5e9a3afe72a7a2e9ed25b000d3bcc3 MKFoundationKit: 4858fe474ee45f988db5ff1e229d700743e71ed8 -COCOAPODS: 0.34.1 +COCOAPODS: 0.35.0 diff --git a/GraphKit/Pods/Pods.xcodeproj/project.pbxproj b/GraphKit/Pods/Pods.xcodeproj/project.pbxproj index e7325e6..4244c3d 100644 --- a/GraphKit/Pods/Pods.xcodeproj/project.pbxproj +++ b/GraphKit/Pods/Pods.xcodeproj/project.pbxproj @@ -10,163 +10,34 @@ 46 objects - 04DD0884D574F996A3225F5D + 03267427FA9BBD2F2D5D8C58 children - CCA420F5961820012DB678DB - 3E7B00ED9FE31D82E8B844F5 - A21B8E5ED72D28CC0B59B61F - 3247F1B360BF9794AB2F83C0 - 5F8F0847C5D95F8E21927654 - 6778F8744F900A1FB192F4EB - A90A5E4F0B5416378F5C0E00 + 1928DD7983F23DF6AB4C8233 isa PBXGroup name - Pods - path - Target Support Files/Pods + Resources sourceTree <group> - 07AE52285D8FD14E80478D48 + 05A39D994C821D9CDA15BF06 - baseConfigurationReference - BE944C65401815D64DBEAE67 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - YES - DSTROOT - /tmp/xcodeproj.dst - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Target Support Files/Pods-BButton/Pods-BButton-prefix.pch - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name + buildConfigurations + + 1C6952764407C44FA7306EE9 + 64715CD29166D3FCD0F6B678 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName Release - - 0A6BFF8E325304D2A2C4482C - - isa - PBXTargetDependency - target - 36B0016EEE2CC582A7893153 - targetProxy - F1B1A2DBD1FD26C036560DF2 - - 0C67D5CE08B349685187010F - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - ViewFrameAccessor.m - path - FrameAccessor/ViewFrameAccessor.m - sourceTree - <group> - - 109E6BA0FD97C528310B3B4F - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - UIColor+BButton.m - path - BButton/Classes/UIColor+BButton.m - sourceTree - <group> - - 125E28116DD575A7F8B1A063 - - containerPortal - 4081831429250433B34D8D00 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 5CD077CF8D707CC04405947B - remoteInfo - Pods-FrameAccessor - - 127F577E37396D0DB9CAF69B - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-FrameAccessor-dummy.m - sourceTree - <group> - - 1367208B257065400E090434 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - NSString+FontAwesome.m - path - BButton/Classes/NSString+FontAwesome.m - sourceTree - <group> - - 13EBD7D52CCD1AE693C28276 - - fileRef - 144D8ADA74C8B1D6D2D07027 - isa - PBXBuildFile + XCConfigurationList - 144D8ADA74C8B1D6D2D07027 + 06A4F383C4053D6C9D350A36 includeInIndex 1 @@ -181,331 +52,93 @@ sourceTree <group> - 1465BDE2B2369F2F5268F13D - - children - - 38AAE838DE661F331FD33264 - BE944C65401815D64DBEAE67 - EFF1C273568DC43C28E9BA34 - BA0EF47255E9C828ADAF0131 - - isa - PBXGroup - name - Support Files - path - ../Target Support Files/Pods-BButton - sourceTree - <group> - - 16F8C813FFFC6D56CB40CD98 - - buildConfigurationList - DCDC30D8634FEB28A4F73953 - buildPhases - - EDA5EDC39AF4433FF0A43C30 - ADE90DDAC96881F926F86DFE - 894C797705D4420C94445371 - - buildRules - - dependencies - - isa - PBXNativeTarget - name - Pods-BButton - productName - Pods-BButton - productReference - 352FCA75F97F674474AF876A - productType - com.apple.product-type.library.static - - 1A153E4FB0DFD82B62C5092F - - fileRef - AA8C769DAECCEEFCD9FEBB93 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - - 1D6C1C9213B4CF9FB6018FCA - - children - - 9EFE73E0A6F8046E8E4A9E91 - 5E75E287444BD5F5EB77A1CC - 127F577E37396D0DB9CAF69B - ABBE157AB17C0367C7753B02 - - isa - PBXGroup - name - Support Files - path - ../Target Support Files/Pods-FrameAccessor - sourceTree - <group> - - 215B0289706C49C1C45F292F - - children - - 60DC39B3A824FFEA8DDA469A - AC4788A927D7AC9CA7A72DF1 - 41ED1E638EAAAA990A745103 - 912F62D2E8D4EBD86C0E6728 - EF662A7EA9F6248DB8E29EED - DDFA389B7E2E115A1C40CD1C - AA8C769DAECCEEFCD9FEBB93 - 8E7E70851A381A6B47805416 - F9FB9BFE37AA5020E67F26D3 - B1C38C52B37B607F79DEAE1C - 2E85525B5A0C6955953B3E07 - - isa - PBXGroup - name - NSArray - sourceTree - <group> - - 248FE59DAC661123EC89B4DD - - fileRef - 60DC39B3A824FFEA8DDA469A - isa - PBXBuildFile - - 26614EA34C78790C99EEACF9 - - fileRef - C9421A61E2978684FA58E29C - isa - PBXBuildFile - - 2C79AB8ADE810E8BCCC53A3F + 06F830D1BAC48CAAC7281105 buildActionMask 2147483647 files - 33A11CA45F54602BF3965EAB + E1FEA8B5ABF5D67BA1E05793 isa - PBXFrameworksBuildPhase + PBXSourcesBuildPhase runOnlyForDeploymentPostprocessing 0 - 2D469A5FAB60CE6724AA4264 - - children - - 4CBF76FE57EBA436C4BD2E47 - DB1CD169FBE0F9C00E851C28 - 888EEDA88642A006AFCA3DFB - F3848843D5B97A96F579EAB6 - 4DBAF356CF60DD111F51DCD8 - - isa - PBXGroup - sourceTree - <group> - - 2E7F5A2C8B5B9F24F9BF49CD - - buildConfigurations - - C9F5100C746B645F45A79838 - 3B3C113EBEC78337CFC46511 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 2E85525B5A0C6955953B3E07 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - NSMutableArray+MK_Stack.m - path - Source/NSArray/NSMutableArray+MK_Stack.m - sourceTree - <group> - - 30210AC3FEC08339D97D0830 + 087E5B210A825A65D6FB6E99 fileRef - 72DC613BC7FF4E2CE032E5F0 + 77066173232DA84174CB184A isa PBXBuildFile - 3023DD6BD3834376CF1C4F8A + 09F13EDC6B230712E98FE1F2 containerPortal - 4081831429250433B34D8D00 + 43E243E00171221A2788F8F6 isa PBXContainerItemProxy proxyType 1 remoteGlobalIDString - 16F8C813FFFC6D56CB40CD98 + 470FBE2A66E4A54C5E9A00DA remoteInfo - Pods-BButton - - 3247F1B360BF9794AB2F83C0 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Pods-environment.h - sourceTree - <group> - - 334C6E06C2E1830BB4C8BAA9 - - fileRef - 8E7E70851A381A6B47805416 - isa - PBXBuildFile - - 33A11CA45F54602BF3965EAB - - fileRef - 8EAA48667418CA12CD1DE295 - isa - PBXBuildFile - - 352FCA75F97F674474AF876A - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods-BButton.a - sourceTree - BUILT_PRODUCTS_DIR - - 36B0016EEE2CC582A7893153 - - buildConfigurationList - AB32C0E415878E890B403EB7 - buildPhases - - DCB19800D5A28B4C8B243333 - A23C6C82694984AEFAF77A30 - 4858E4032F1590C7BF9C3214 - - buildRules - - dependencies - - isa - PBXNativeTarget - name - Pods-MKFoundationKit - productName - Pods-MKFoundationKit - productReference - 6D18BCB4CE8BB170540B0B18 - productType - com.apple.product-type.library.static - - 36FFC9137C5FA88CC8511F04 - - fileRef - DDFA389B7E2E115A1C40CD1C - isa - PBXBuildFile - - 383E6FA1EFCE875105BF7C27 - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods.a - sourceTree - BUILT_PRODUCTS_DIR - - 38AAE838DE661F331FD33264 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-BButton.xcconfig - sourceTree - <group> + Pods-FrameAccessor - 3B3C113EBEC78337CFC46511 + 0EF241A32FCF5B97C7F91BDF - baseConfigurationReference - 5E75E287444BD5F5EB77A1CC buildSettings ALWAYS_SEARCH_USER_PATHS NO - COPY_PHASE_STRIP + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES YES - DSTROOT - /tmp/xcodeproj.dst - GCC_PRECOMPILE_PREFIX_HEADER + CLANG_ENABLE_OBJC_ARC YES - GCC_PREFIX_HEADER - Target Support Files/Pods-FrameAccessor/Pods-FrameAccessor-prefix.pch - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + COPY_PHASE_STRIP + NO + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_PREPROCESSOR_DEFINITIONS - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) + RELEASE=1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.1 + STRIP_INSTALLED_PRODUCT + NO VALIDATE_PRODUCT YES @@ -514,68 +147,92 @@ name Release - 3DCF36FF802C5A42280BA8B6 + 103E90632AC1193FA87390D3 - fileRef - 83158C63DDBF496F6D1EB9D0 + children + + C55817F890472AA94E015025 + 8804F025825FE0E8942185EE + B6CC26B2EBA8E15A23F78EDB + 9D72FE43D56DB95F76696A70 + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - + PBXGroup + name + Support Files + path + ../Target Support Files/Pods-BButton + sourceTree + <group> - 3E7B00ED9FE31D82E8B844F5 + 13120617FAEA3245E943E4CA includeInIndex 1 isa PBXFileReference lastKnownFileType - text.plist.xml + text.xcconfig path - Pods-acknowledgements.plist + Pods.release.xcconfig sourceTree <group> - 3E9D8C79099D706E90185941 + 183887AE0DDB40F65C1A4F88 fileRef - 8E82D0E1A25E28A0EEAB430A + DD84213F30BAB5A2245D17C4 isa PBXBuildFile - 3FEB69A57E8D10C9B56CEB7E + 1928DD7983F23DF6AB4C8233 + + includeInIndex + 1 + isa + PBXFileReference + name + FontAwesome.ttf + path + BButton/resources/FontAwesome.ttf + sourceTree + <group> + + 1C6952764407C44FA7306EE9 baseConfigurationReference - A90A5E4F0B5416378F5C0E00 + 8804F025825FE0E8942185EE buildSettings ALWAYS_SEARCH_USER_PATHS NO COPY_PHASE_STRIP - YES + NO DSTROOT /tmp/xcodeproj.dst + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 GCC_PRECOMPILE_PREFIX_HEADER YES + GCC_PREFIX_HEADER + Target Support Files/Pods-BButton/Pods-BButton-prefix.pch + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO INSTALL_PATH $(BUILT_PRODUCTS_DIR) IPHONEOS_DEPLOYMENT_TARGET 7.1 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - OTHER_LDFLAGS + OTHER_LIBTOOLFLAGS + PRODUCT_NAME $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH @@ -584,100 +241,64 @@ iphoneos SKIP_INSTALL YES - VALIDATE_PRODUCT - YES isa XCBuildConfiguration name - Release + Debug - 4081831429250433B34D8D00 + 1DA61D3C29016071B597344A - attributes - - LastUpgradeCheck - 0510 - buildConfigurationList - 97E6DDB50678D30E0F5F9732 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions + 9284AC7588D55C0CCA206D11 + buildPhases - en + 8B05479008CC5B5698DF3A20 + D2880E9281362A2D77F2432A + 66562A6E879451B57839132C - mainGroup - 2D469A5FAB60CE6724AA4264 - productRefGroup - F3848843D5B97A96F579EAB6 - projectDirPath - - projectReferences + buildRules + + dependencies - projectRoot - - targets - - A72FC8FE98A3D890CC72EA3D - 16F8C813FFFC6D56CB40CD98 - 5CD077CF8D707CC04405947B - 36B0016EEE2CC582A7893153 - - - 41ED1E638EAAAA990A745103 - - includeInIndex - 1 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXNativeTarget name - NSArray+MK_Block.m - path - Source/NSArray/NSArray+MK_Block.m - sourceTree - <group> + Pods-MKFoundationKit + productName + Pods-MKFoundationKit + productReference + 9166B68ACC10DE362DA2FEBF + productType + com.apple.product-type.library.static - 4858E4032F1590C7BF9C3214 + 1E8751852388407F5D30EB4C - buildActionMask - 2147483647 - files + children - 248FE59DAC661123EC89B4DD - 804871A5FB7D37AA584F8D0F - F345C7F1DF986481CE68BFD8 - 36FFC9137C5FA88CC8511F04 - 334C6E06C2E1830BB4C8BAA9 - C8234A31B86C7A4020314D1F + B99CCEA3DBE3B2D8C28A8D6E isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXGroup + name + Frameworks + sourceTree + <group> - 49F9BC4350609DF0CC96A387 + 20ED8916ED6A622D5019BFDE includeInIndex 1 isa PBXFileReference - name - FontAwesome.ttf + lastKnownFileType + sourcecode.c.h path - BButton/resources/FontAwesome.ttf + Pods-MKFoundationKit-prefix.pch sourceTree <group> - 4BB16FEFD7D2F15C05125580 + 232B42BEB8251DD25B6853DE includeInIndex 1 @@ -686,128 +307,83 @@ lastKnownFileType sourcecode.c.h name - BButton.h + NSMutableArray+MK_Misc.h path - BButton/Classes/BButton.h - sourceTree - <group> - - 4C85FBB5E55616156AC7BEEE - - children - - 49F9BC4350609DF0CC96A387 - - isa - PBXGroup - name - Resources + Source/NSArray/NSMutableArray+MK_Misc.h sourceTree <group> - 4CBF76FE57EBA436C4BD2E47 + 234AC4DE29B13EB114BE0B41 includeInIndex 1 isa PBXFileReference lastKnownFileType - text + sourcecode.c.objc name - Podfile + NSString+FontAwesome.m path - ../Podfile - sourceTree - SOURCE_ROOT - xcLanguageSpecificationIdentifier - xcode.lang.ruby - - 4DBAF356CF60DD111F51DCD8 - - children - - 04DD0884D574F996A3225F5D - - isa - PBXGroup - name - Targets Support Files + BButton/Classes/NSString+FontAwesome.m sourceTree <group> - 59C29D2FDD2833BF00C3DA81 + 286522F427BB0841604F0AF1 - buildConfigurations - - 7CF1E8C51FD79BBF6A1CF77C - 3FEB69A57E8D10C9B56CEB7E - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + containerPortal + 43E243E00171221A2788F8F6 isa - XCConfigurationList + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + B4781ED489FDD60F41C908AB + remoteInfo + Pods-BButton - 5CD077CF8D707CC04405947B + 317ADD31081C4835F1A6C349 - buildConfigurationList - 2E7F5A2C8B5B9F24F9BF49CD - buildPhases - - ED5F7779B9AF9E7BC0907009 - 2C79AB8ADE810E8BCCC53A3F - C3C089649D434AB333697C97 - - buildRules - - dependencies - + fileRef + B4568BD76148B7E5824AA3D6 isa - PBXNativeTarget - name - Pods-FrameAccessor - productName - Pods-FrameAccessor - productReference - A77147BD9C4057B8B303B15D - productType - com.apple.product-type.library.static + PBXBuildFile - 5E59569DFC54377B0BF66444 + 3234FA76B715EC2E564F3F63 fileRef - CF53FFCE3D6AA9585DC50123 + 703C86530D8778C8581BC1BF isa PBXBuildFile - 5E75E287444BD5F5EB77A1CC + 3365F13238994596F6642D0B includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc + name + BButton.m path - Pods-FrameAccessor-Private.xcconfig + BButton/Classes/BButton.m sourceTree <group> - 5F8F0847C5D95F8E21927654 + 3566BFF8FE55C043F1D87F00 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.script.sh + sourcecode.c.h path - Pods-resources.sh + Pods-environment.h sourceTree <group> - 60DC39B3A824FFEA8DDA469A + 3970B61363F86E4AE3EB85EB includeInIndex 1 @@ -815,195 +391,189 @@ PBXFileReference lastKnownFileType sourcecode.c.h + path + Pods-FrameAccessor-prefix.pch + sourceTree + <group> + + 3B763F4B614998603A60642A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - NSArray+MK.h + ViewFrameAccessor.m path - Source/NSArray/NSArray+MK.h + FrameAccessor/ViewFrameAccessor.m sourceTree <group> - 60F9D37D38C008DB55F1CEC6 + 3F0318599F7A700B1E2B16F3 - baseConfigurationReference - BE944C65401815D64DBEAE67 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Target Support Files/Pods-BButton/Pods-BButton-prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - + children + + AA646EE034334A8F2D868E8B + A3D6049E86E12252C54C0F31 + B4568BD76148B7E5824AA3D6 + 20ED8916ED6A622D5019BFDE + isa - XCBuildConfiguration + PBXGroup name - Debug + Support Files + path + ../Target Support Files/Pods-MKFoundationKit + sourceTree + <group> - 6778F8744F900A1FB192F4EB + 3F046CEE5F25F34107C004C5 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + text path - Pods.debug.xcconfig + Pods-acknowledgements.markdown sourceTree <group> - 67ACC885B3BCD44FF67BD541 + 3F4497E5E409196DBC904828 + + isa + PBXTargetDependency + name + Pods-MKFoundationKit + target + 1DA61D3C29016071B597344A + targetProxy + 94E7DD800CF518DD5F8AE1F2 + + 3FB623813B3BC194FD4483DF fileRef - 8EAA48667418CA12CD1DE295 + B1355553743A29F4B4E25C10 isa PBXBuildFile - 6BF830D2244E3EA2285358E5 + 428F5B3BF1C9F3BF47C1F33D fileRef - 127F577E37396D0DB9CAF69B + 4B22604F983AB60429A7D355 isa PBXBuildFile - 6D18BCB4CE8BB170540B0B18 + 42B6C4272749FCDFAB3A9314 - explicitFileType - archive.ar - includeInIndex + fileRef + ED9795A9DD545EE8B8FB0B94 + isa + PBXBuildFile + + 43E243E00171221A2788F8F6 + + attributes + + LastUpgradeCheck + 0510 + + buildConfigurationList + F4CDDAB15DE0F60328814B84 + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings 0 isa - PBXFileReference - path - libPods-MKFoundationKit.a - sourceTree - BUILT_PRODUCTS_DIR + PBXProject + knownRegions + + en + + mainGroup + ED903040FB6863264D1BE3D8 + productRefGroup + EF177C2EAA7F2B7C4381E3FF + projectDirPath + + projectReferences + + projectRoot + + targets + + 90512E2261E2A281CBD49451 + B4781ED489FDD60F41C908AB + 470FBE2A66E4A54C5E9A00DA + 1DA61D3C29016071B597344A + - 6EBDE23522D0CD7659000C4C + 4678903AB220FEE6F437BD14 isa PBXTargetDependency + name + Pods-BButton target - 16F8C813FFFC6D56CB40CD98 + B4781ED489FDD60F41C908AB targetProxy - 3023DD6BD3834376CF1C4F8A + 286522F427BB0841604F0AF1 - 72DC613BC7FF4E2CE032E5F0 + 4686952A141CF9A75A990FA1 - includeInIndex - 1 + fileRef + 06A4F383C4053D6C9D350A36 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - FrameAccessor.h - path - FrameAccessor/FrameAccessor.h - sourceTree - <group> + PBXBuildFile - 7B0D510546973379A067BA7D + 468DE8831A71640871135807 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - NO - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - COPY_PHASE_STRIP - YES - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - ONLY_ACTIVE_ARCH - YES - STRIP_INSTALLED_PRODUCT - NO - + fileRef + 5AB31AB64E323C158227128C isa - XCBuildConfiguration + PBXBuildFile + + 47077E926DD60FA8BE6DF45D + + fileRef + C9729BFE892B39E3CC8F3993 + isa + PBXBuildFile + + 470FBE2A66E4A54C5E9A00DA + + buildConfigurationList + C6A36CCAA78383C22B289AAE + buildPhases + + 59D9664978CBB0053052437D + 692B9446D9B2728D40E6225C + 5232032BF0037D5F94BBE020 + + buildRules + + dependencies + + isa + PBXNativeTarget name - Debug + Pods-FrameAccessor + productName + Pods-FrameAccessor + productReference + 52E255734C48FD62EF61E6ED + productType + com.apple.product-type.library.static - 7CF1E8C51FD79BBF6A1CF77C + 47E9042BC7872DB77080F395 baseConfigurationReference - 6778F8744F900A1FB192F4EB + C29E292403DCD9EABB22FA34 buildSettings ALWAYS_SEARCH_USER_PATHS @@ -1031,6 +601,8 @@ 7.1 OTHER_LDFLAGS + OTHER_LIBTOOLFLAGS + PRODUCT_NAME $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH @@ -1045,182 +617,258 @@ name Debug - 7D2E5EB68B9021889ABEFAE5 + 49368BF944FF28A7A4DBD4D6 fileRef - 4BB16FEFD7D2F15C05125580 + 3B763F4B614998603A60642A isa PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 7EE4071A20DAC4EA3EEC38E0 + 4AB2856108D8059C3B6E250D + + buildActionMask + 2147483647 + files + + B264CCA9303D8D52A72C80AF + BB2F47509AD529B7732B32F4 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 4B22604F983AB60429A7D355 - fileRef - 8EAA48667418CA12CD1DE295 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + wrapper.framework + name + Foundation.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework + sourceTree + DEVELOPER_DIR - 804871A5FB7D37AA584F8D0F + 4BF76B78357C0333BA94A9BE fileRef - AC4788A927D7AC9CA7A72DF1 + D669D329788D7B0A436B391C isa PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 83158C63DDBF496F6D1EB9D0 + 4FB4AA3EB329736BECB61F92 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - BButton.m + NSMutableArray+MK_Stack.h path - BButton/Classes/BButton.m + Source/NSArray/NSMutableArray+MK_Stack.h sourceTree <group> - 85B8FC3775938BECE90CD129 - - fileRef - BD43196EEBFD9F83E69433CF - isa - PBXBuildFile - - 888EEDA88642A006AFCA3DFB + 5040FAFE317559C2F50B301E - children - - F663FD33BB05426DF30BE049 - F702F3768CB67AA8E0F23BC4 - E4D4CB012EFBB4BA1D6D960E - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - Pods + NSArray+MK_Block.m + path + Source/NSArray/NSArray+MK_Block.m sourceTree <group> - 894C797705D4420C94445371 + 5232032BF0037D5F94BBE020 buildActionMask 2147483647 files - 7D2E5EB68B9021889ABEFAE5 - 26614EA34C78790C99EEACF9 - B85313C307787E3427945A1A + AF79E0D6B000E69D0B40B155 + 4686952A141CF9A75A990FA1 + 47077E926DD60FA8BE6DF45D isa PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - 8CA495BA301CCC827864DA96 + 52E255734C48FD62EF61E6ED + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + path + libPods-FrameAccessor.a + sourceTree + BUILT_PRODUCTS_DIR + + 57F11ED55DDE25ED5F3742EA fileRef - 1367208B257065400E090434 + 75CF44A4089C7559EBC68BFD isa PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - 8E7E70851A381A6B47805416 + 586BD2AEBB9797D495B04E82 + + fileRef + C7682B8C86087E720C8B142F + isa + PBXBuildFile + + 59D9664978CBB0053052437D + + buildActionMask + 2147483647 + files + + 183887AE0DDB40F65C1A4F88 + 4BF76B78357C0333BA94A9BE + 49368BF944FF28A7A4DBD4D6 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 5AB31AB64E323C158227128C includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - NSMutableArray+MK_Queue.h + NSMutableArray+MK_Misc.m path - Source/NSArray/NSMutableArray+MK_Queue.h + Source/NSArray/NSMutableArray+MK_Misc.m sourceTree <group> - 8E82D0E1A25E28A0EEAB430A + 5B179B2ABD3388BF2E1C7113 + + fileRef + B6CC26B2EBA8E15A23F78EDB + isa + PBXBuildFile + + 5F05D661447052C3FA2A1FEF includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text name - ViewFrameAccessor.h + Podfile path - FrameAccessor/ViewFrameAccessor.h + ../Podfile sourceTree - <group> + SOURCE_ROOT + xcLanguageSpecificationIdentifier + xcode.lang.ruby - 8EAA48667418CA12CD1DE295 + 60A32D05C5A81DEF03A8135A + children + + 3F046CEE5F25F34107C004C5 + ED2902FAEDCE52FBD11FCF03 + B0989FAA3C6FF4561C9C7280 + 3566BFF8FE55C043F1D87F00 + BAE1E89DA96AE78A93334703 + C29E292403DCD9EABB22FA34 + 13120617FAEA3245E943E4CA + isa - PBXFileReference - lastKnownFileType - wrapper.framework + PBXGroup name - Foundation.framework + Pods path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework + Target Support Files/Pods sourceTree - DEVELOPER_DIR + <group> - 912F62D2E8D4EBD86C0E6728 + 638F504AE4302409402154FE - includeInIndex - 1 + children + + A0BBD34E6C57923191461FB6 + 06A4F383C4053D6C9D350A36 + D669D329788D7B0A436B391C + C9729BFE892B39E3CC8F3993 + 3B763F4B614998603A60642A + 67FA83EDB17DFC29CC12C047 + isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXGroup name - NSArray+MK_Misc.h + FrameAccessor path - Source/NSArray/NSArray+MK_Misc.h + FrameAccessor sourceTree <group> - 93EAE76840B5FE43DFC92D37 + 64715CD29166D3FCD0F6B678 baseConfigurationReference - F1D0A43EE06E289AEF49C3BC + 8804F025825FE0E8942185EE buildSettings ALWAYS_SEARCH_USER_PATHS NO COPY_PHASE_STRIP - NO + YES DSTROOT /tmp/xcodeproj.dst - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 GCC_PRECOMPILE_PREFIX_HEADER YES GCC_PREFIX_HEADER - Target Support Files/Pods-MKFoundationKit/Pods-MKFoundationKit-prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO + Target Support Files/Pods-BButton/Pods-BButton-prefix.pch INSTALL_PATH $(BUILT_PRODUCTS_DIR) IPHONEOS_DEPLOYMENT_TARGET 7.1 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + OTHER_LDFLAGS + OTHER_LIBTOOLFLAGS + PRODUCT_NAME $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH @@ -1229,71 +877,157 @@ iphoneos SKIP_INSTALL YES + VALIDATE_PRODUCT + YES isa XCBuildConfiguration name - Debug + Release - 97E6DDB50678D30E0F5F9732 + 65FFB01C625A97995685B6E7 - buildConfigurations + children - 7B0D510546973379A067BA7D - A1FC8B4575F051AF7F06CCD5 + 60A32D05C5A81DEF03A8135A - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXGroup + name + Targets Support Files + sourceTree + <group> - 987BCB75BE34BD7A38AC1466 + 66562A6E879451B57839132C - fileRef - F9FB9BFE37AA5020E67F26D3 + buildActionMask + 2147483647 + files + + 087E5B210A825A65D6FB6E99 + DDC6A910C603168838F7B425 + 3FB623813B3BC194FD4483DF + 9BE708506CFD48C8CFD7E4AD + 42B6C4272749FCDFAB3A9314 + D189F0E3C92A597572709406 + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 988EBC9D4E255C2331B8CD8D + 67C778154C269190E6F79464 fileRef - 2E85525B5A0C6955953B3E07 + 4B22604F983AB60429A7D355 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - 9BBEC994331360015C7CA452 + 67FA83EDB17DFC29CC12C047 + + children + + 9016528EECC1334FF96A2581 + 76886E21EE6B3599998A78A1 + DD84213F30BAB5A2245D17C4 + 3970B61363F86E4AE3EB85EB + + isa + PBXGroup + name + Support Files + path + ../Target Support Files/Pods-FrameAccessor + sourceTree + <group> + + 692B9446D9B2728D40E6225C buildActionMask 2147483647 files - B33E407E71D6C85F0A4E55CA + F25F62DA18E721EE69E7D8BB isa - PBXSourcesBuildPhase + PBXFrameworksBuildPhase runOnlyForDeploymentPostprocessing 0 - 9E087F95648C240E64599DC7 + 6CDDC4147B9F1224502338D8 + + children + + 95808A2C6515D6B1C536603D + 3365F13238994596F6642D0B + DA71E4A023465D21F972CF83 + 234AC4DE29B13EB114BE0B41 + C7682B8C86087E720C8B142F + 75CF44A4089C7559EBC68BFD + 03267427FA9BBD2F2D5D8C58 + 103E90632AC1193FA87390D3 + + isa + PBXGroup + name + BButton + path + BButton + sourceTree + <group> + + 6D5F7C699535954ADFCA12CC fileRef - 8EAA48667418CA12CD1DE295 + 3365F13238994596F6642D0B isa PBXBuildFile - 9EFE73E0A6F8046E8E4A9E91 + 703368C555D13258554204C7 + + buildConfigurations + + 47E9042BC7872DB77080F395 + 80D73B1A4537E02072B6524B + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 703C86530D8778C8581BC1BF + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + NSMutableArray+MK_Queue.m + path + Source/NSArray/NSMutableArray+MK_Queue.m + sourceTree + <group> + + 75CF44A4089C7559EBC68BFD + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + UIColor+BButton.m + path + BButton/Classes/UIColor+BButton.m + sourceTree + <group> + + 76886E21EE6B3599998A78A1 includeInIndex 1 @@ -1302,71 +1036,72 @@ lastKnownFileType text.xcconfig path - Pods-FrameAccessor.xcconfig + Pods-FrameAccessor-Private.xcconfig + sourceTree + <group> + + 77066173232DA84174CB184A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + NSArray+MK.h + path + Source/NSArray/NSArray+MK.h sourceTree <group> - 9FC084735184119190A28946 + 79904D59000A3CC9470B4B97 fileRef - 0C67D5CE08B349685187010F + 5040FAFE317559C2F50B301E isa PBXBuildFile - A1FC8B4575F051AF7F06CCD5 + 80D73B1A4537E02072B6524B + baseConfigurationReference + 13120617FAEA3245E943E4CA buildSettings ALWAYS_SEARCH_USER_PATHS NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - NO - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES COPY_PHASE_STRIP - NO - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_PREPROCESSOR_DEFINITIONS - - RELEASE=1 - - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION YES - GCC_WARN_UNUSED_VARIABLE + DSTROOT + /tmp/xcodeproj.dst + GCC_PRECOMPILE_PREFIX_HEADER YES + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) IPHONEOS_DEPLOYMENT_TARGET 7.1 - STRIP_INSTALLED_PRODUCT - NO + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES VALIDATE_PRODUCT YES @@ -1375,51 +1110,76 @@ name Release - A21B8E5ED72D28CC0B59B61F + 827ED69038E13256F2D92B7C + + children + + 6CDDC4147B9F1224502338D8 + 638F504AE4302409402154FE + 854EE0A8054081B572877A6B + + isa + PBXGroup + name + Pods + sourceTree + <group> + + 854EE0A8054081B572877A6B + + children + + B0D6615BF658CED9E61A02B4 + 3F0318599F7A700B1E2B16F3 + + isa + PBXGroup + name + MKFoundationKit + path + MKFoundationKit + sourceTree + <group> + + 8804F025825FE0E8942185EE includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + text.xcconfig path - Pods-dummy.m + Pods-BButton-Private.xcconfig sourceTree <group> - A23C6C82694984AEFAF77A30 + 8B05479008CC5B5698DF3A20 buildActionMask 2147483647 files - 67ACC885B3BCD44FF67BD541 + 79904D59000A3CC9470B4B97 + 96BBDC642EC6DE18FEC514A0 + 468DE8831A71640871135807 + 3234FA76B715EC2E564F3F63 + 8D931C5FC2F3A45481243D40 + 317ADD31081C4835F1A6C349 isa - PBXFrameworksBuildPhase + PBXSourcesBuildPhase runOnlyForDeploymentPostprocessing 0 - A59D3778DB927E6858ED23A0 + 8D931C5FC2F3A45481243D40 - children - - A61AE0FACD7C245A46320B44 - F1D0A43EE06E289AEF49C3BC - AB92EEFFD7E8CE558EBE737D - C3EB211F56087A5FE4B6E04D - + fileRef + EEAF652046511CEEA9D71D79 isa - PBXGroup - name - Support Files - path - ../Target Support Files/Pods-MKFoundationKit - sourceTree - <group> + PBXBuildFile - A61AE0FACD7C245A46320B44 + 9016528EECC1334FF96A2581 includeInIndex 1 @@ -1428,26 +1188,26 @@ lastKnownFileType text.xcconfig path - Pods-MKFoundationKit.xcconfig + Pods-FrameAccessor.xcconfig sourceTree <group> - A72FC8FE98A3D890CC72EA3D + 90512E2261E2A281CBD49451 buildConfigurationList - 59C29D2FDD2833BF00C3DA81 + 703368C555D13258554204C7 buildPhases - 9BBEC994331360015C7CA452 - EFAAA06A0A1EC1746456DB70 + 06F830D1BAC48CAAC7281105 + CBC9F24E073ADA532066AD5D buildRules dependencies - 6EBDE23522D0CD7659000C4C - D666FC3B40644BBB94A74F65 - 0A6BFF8E325304D2A2C4482C + 4678903AB220FEE6F437BD14 + 9DAD61639876C14843F32E97 + 3F4497E5E409196DBC904828 isa PBXNativeTarget @@ -1456,11 +1216,11 @@ productName Pods productReference - 383E6FA1EFCE875105BF7C27 + D7EB527A33BA844A0BE34221 productType com.apple.product-type.library.static - A77147BD9C4057B8B303B15D + 9166B68ACC10DE362DA2FEBF explicitFileType archive.ar @@ -1469,44 +1229,23 @@ isa PBXFileReference path - libPods-FrameAccessor.a + libPods-MKFoundationKit.a sourceTree BUILT_PRODUCTS_DIR - A90A5E4F0B5416378F5C0E00 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods.release.xcconfig - sourceTree - <group> - - AA8C769DAECCEEFCD9FEBB93 + 916EE3574A9D93DDE4A25C12 - includeInIndex - 1 + fileRef + DA71E4A023465D21F972CF83 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - NSMutableArray+MK_Misc.m - path - Source/NSArray/NSMutableArray+MK_Misc.m - sourceTree - <group> + PBXBuildFile - AB32C0E415878E890B403EB7 + 9284AC7588D55C0CCA206D11 buildConfigurations - 93EAE76840B5FE43DFC92D37 - C3A9D1CBC08B4CAF3172193E + E3FB835CE95261B905B708BE + A873C98669AAFA22430AF52F defaultConfigurationIsVisible 0 @@ -1515,33 +1254,27 @@ isa XCConfigurationList - AB92EEFFD7E8CE558EBE737D + 9293B5E515536B85777C37DF - includeInIndex - 1 + fileRef + 234AC4DE29B13EB114BE0B41 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-MKFoundationKit-dummy.m - sourceTree - <group> + PBXBuildFile - ABBE157AB17C0367C7753B02 + 94E7DD800CF518DD5F8AE1F2 - includeInIndex - 1 + containerPortal + 43E243E00171221A2788F8F6 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Pods-FrameAccessor-prefix.pch - sourceTree - <group> + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 1DA61D3C29016071B597344A + remoteInfo + Pods-MKFoundationKit - AC4788A927D7AC9CA7A72DF1 + 95808A2C6515D6B1C536603D includeInIndex 1 @@ -1550,27 +1283,27 @@ lastKnownFileType sourcecode.c.h name - NSArray+MK_Block.h + BButton.h path - Source/NSArray/NSArray+MK_Block.h + BButton/Classes/BButton.h sourceTree <group> - ADE90DDAC96881F926F86DFE + 96BBDC642EC6DE18FEC514A0 - buildActionMask - 2147483647 - files - - 5E59569DFC54377B0BF66444 - 9E087F95648C240E64599DC7 - + fileRef + A375E5B2201DE236C903060A isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile + + 9BE708506CFD48C8CFD7E4AD + + fileRef + 232B42BEB8251DD25B6853DE + isa + PBXBuildFile - B1C38C52B37B607F79DEAE1C + 9D72FE43D56DB95F76696A70 includeInIndex 1 @@ -1578,28 +1311,23 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - NSMutableArray+MK_Stack.h path - Source/NSArray/NSMutableArray+MK_Stack.h + Pods-BButton-prefix.pch sourceTree <group> - B33E407E71D6C85F0A4E55CA - - fileRef - A21B8E5ED72D28CC0B59B61F - isa - PBXBuildFile - - B85313C307787E3427945A1A + 9DAD61639876C14843F32E97 - fileRef - E647CED747138C8B40CDF94D isa - PBXBuildFile + PBXTargetDependency + name + Pods-FrameAccessor + target + 470FBE2A66E4A54C5E9A00DA + targetProxy + 09F13EDC6B230712E98FE1F2 - BA0EF47255E9C828ADAF0131 + A0BBD34E6C57923191461FB6 includeInIndex 1 @@ -1607,12 +1335,14 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + FrameAccessor.h path - Pods-BButton-prefix.pch + FrameAccessor/FrameAccessor.h sourceTree <group> - BD43196EEBFD9F83E69433CF + A375E5B2201DE236C903060A includeInIndex 1 @@ -1621,13 +1351,13 @@ lastKnownFileType sourcecode.c.objc name - ScrollViewFrameAccessor.m + NSArray+MK_Misc.m path - FrameAccessor/ScrollViewFrameAccessor.m + Source/NSArray/NSArray+MK_Misc.m sourceTree <group> - BE944C65401815D64DBEAE67 + A3D6049E86E12252C54C0F31 includeInIndex 1 @@ -1636,21 +1366,63 @@ lastKnownFileType text.xcconfig path - Pods-BButton-Private.xcconfig + Pods-MKFoundationKit-Private.xcconfig sourceTree <group> - BF866D8E8EBDEEFCFCFEDD2A + A76D1BC84BAD8A004A745DDC - fileRef - EFF1C273568DC43C28E9BA34 + baseConfigurationReference + 76886E21EE6B3599998A78A1 + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + NO + DSTROOT + /tmp/xcodeproj.dst + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + Target Support Files/Pods-FrameAccessor/Pods-FrameAccessor-prefix.pch + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 7.1 + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXBuildFile + XCBuildConfiguration + name + Debug - C3A9D1CBC08B4CAF3172193E + A873C98669AAFA22430AF52F baseConfigurationReference - F1D0A43EE06E289AEF49C3BC + A3D6049E86E12252C54C0F31 buildSettings ALWAYS_SEARCH_USER_PATHS @@ -1679,6 +1451,8 @@ OTHER_LDFLAGS + OTHER_LIBTOOLFLAGS + PRODUCT_NAME $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH @@ -1695,76 +1469,233 @@ name Release - C3C089649D434AB333697C97 + AA646EE034334A8F2D868E8B + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + Pods-MKFoundationKit.xcconfig + sourceTree + <group> + + AF79E0D6B000E69D0B40B155 + + fileRef + A0BBD34E6C57923191461FB6 + isa + PBXBuildFile + + B0989FAA3C6FF4561C9C7280 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + Pods-dummy.m + sourceTree + <group> + + B0D6615BF658CED9E61A02B4 + + children + + 77066173232DA84174CB184A + F8A43EB5C83A0A6DB3620F19 + 5040FAFE317559C2F50B301E + B1355553743A29F4B4E25C10 + A375E5B2201DE236C903060A + 232B42BEB8251DD25B6853DE + 5AB31AB64E323C158227128C + ED9795A9DD545EE8B8FB0B94 + 703C86530D8778C8581BC1BF + 4FB4AA3EB329736BECB61F92 + EEAF652046511CEEA9D71D79 + + isa + PBXGroup + name + NSArray + sourceTree + <group> + + B1355553743A29F4B4E25C10 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + NSArray+MK_Misc.h + path + Source/NSArray/NSArray+MK_Misc.h + sourceTree + <group> + + B264CCA9303D8D52A72C80AF + + fileRef + FB6767747A1B226FBB6AB7A2 + isa + PBXBuildFile + + B4568BD76148B7E5824AA3D6 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + Pods-MKFoundationKit-dummy.m + sourceTree + <group> + + B4781ED489FDD60F41C908AB + + buildConfigurationList + 05A39D994C821D9CDA15BF06 + buildPhases + + E7913533EBD1E7DA308F3DC1 + 4AB2856108D8059C3B6E250D + B6C0B61741FD284BD0D87E57 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + Pods-BButton + productName + Pods-BButton + productReference + E1AA403E61FF0F317815CC67 + productType + com.apple.product-type.library.static + + B6C0B61741FD284BD0D87E57 buildActionMask 2147483647 files - 30210AC3FEC08339D97D0830 - 13EBD7D52CCD1AE693C28276 - 3E9D8C79099D706E90185941 + CBC25B4C1067E985F6AF3DC8 + 916EE3574A9D93DDE4A25C12 + 586BD2AEBB9797D495B04E82 isa PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - C3EB211F56087A5FE4B6E04D + B6CC26B2EBA8E15A23F78EDB includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc path - Pods-MKFoundationKit-prefix.pch + Pods-BButton-dummy.m + sourceTree + <group> + + B99CCEA3DBE3B2D8C28A8D6E + + children + + FB6767747A1B226FBB6AB7A2 + 4B22604F983AB60429A7D355 + + isa + PBXGroup + name + iOS sourceTree <group> - C8234A31B86C7A4020314D1F + BAE1E89DA96AE78A93334703 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.script.sh + path + Pods-resources.sh + sourceTree + <group> + + BB2F47509AD529B7732B32F4 fileRef - B1C38C52B37B607F79DEAE1C + 4B22604F983AB60429A7D355 isa PBXBuildFile - C9421A61E2978684FA58E29C + C29E292403DCD9EABB22FA34 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - NSString+FontAwesome.h + text.xcconfig path - BButton/Classes/NSString+FontAwesome.h + Pods.debug.xcconfig sourceTree <group> - C9F5100C746B645F45A79838 + C4143E983033F0F857BE14AC - baseConfigurationReference - 5E75E287444BD5F5EB77A1CC buildSettings ALWAYS_SEARCH_USER_PATHS NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst + YES + GCC_C_LANGUAGE_STANDARD + gnu99 GCC_DYNAMIC_NO_PIC NO GCC_OPTIMIZATION_LEVEL 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Target Support Files/Pods-FrameAccessor/Pods-FrameAccessor-prefix.pch GCC_PREPROCESSOR_DEFINITIONS DEBUG=1 @@ -1772,140 +1703,156 @@ GCC_SYMBOLS_PRIVATE_EXTERN NO - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES IPHONEOS_DEPLOYMENT_TARGET 7.1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL + ONLY_ACTIVE_ARCH YES + STRIP_INSTALLED_PRODUCT + NO isa XCBuildConfiguration name Debug - CCA420F5961820012DB678DB + C55817F890472AA94E015025 includeInIndex 1 isa PBXFileReference lastKnownFileType - text + text.xcconfig path - Pods-acknowledgements.markdown + Pods-BButton.xcconfig sourceTree <group> - CF53FFCE3D6AA9585DC50123 + C6A36CCAA78383C22B289AAE + + buildConfigurations + + A76D1BC84BAD8A004A745DDC + E98FE032FF6257683A178608 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + C7682B8C86087E720C8B142F + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework + sourcecode.c.h name - CoreGraphics.framework + UIColor+BButton.h path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreGraphics.framework + BButton/Classes/UIColor+BButton.h sourceTree - DEVELOPER_DIR + <group> - D0EEB301A2CD63548672F1FF + C9729BFE892B39E3CC8F3993 - children - - CF53FFCE3D6AA9585DC50123 - 8EAA48667418CA12CD1DE295 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - iOS + ViewFrameAccessor.h + path + FrameAccessor/ViewFrameAccessor.h sourceTree <group> - D666FC3B40644BBB94A74F65 - - isa - PBXTargetDependency - target - 5CD077CF8D707CC04405947B - targetProxy - 125E28116DD575A7F8B1A063 - - D6F236CE2A3D7B12BAF148CD - - fileRef - AB92EEFFD7E8CE558EBE737D - isa - PBXBuildFile - - DA4CB40F8D32DD149B9AC7FA + CBC25B4C1067E985F6AF3DC8 fileRef - 109E6BA0FD97C528310B3B4F + 95808A2C6515D6B1C536603D isa PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - DB1CD169FBE0F9C00E851C28 + CBC9F24E073ADA532066AD5D - children + buildActionMask + 2147483647 + files - D0EEB301A2CD63548672F1FF + 67C778154C269190E6F79464 isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + D189F0E3C92A597572709406 + + fileRef + 4FB4AA3EB329736BECB61F92 + isa + PBXBuildFile - DCB19800D5A28B4C8B243333 + D2880E9281362A2D77F2432A buildActionMask 2147483647 files - E8C956064D21AE89AFE87116 - EF3407671E4E897EBD21DAFD - 1A153E4FB0DFD82B62C5092F - 987BCB75BE34BD7A38AC1466 - 988EBC9D4E255C2331B8CD8D - D6F236CE2A3D7B12BAF148CD + 428F5B3BF1C9F3BF47C1F33D isa - PBXSourcesBuildPhase + PBXFrameworksBuildPhase runOnlyForDeploymentPostprocessing 0 - DCDC30D8634FEB28A4F73953 + D669D329788D7B0A436B391C - buildConfigurations - - 60F9D37D38C008DB55F1CEC6 - 07AE52285D8FD14E80478D48 - - defaultConfigurationIsVisible + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + ScrollViewFrameAccessor.m + path + FrameAccessor/ScrollViewFrameAccessor.m + sourceTree + <group> + + D7EB527A33BA844A0BE34221 + + explicitFileType + archive.ar + includeInIndex 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXFileReference + path + libPods.a + sourceTree + BUILT_PRODUCTS_DIR - DDFA389B7E2E115A1C40CD1C + DA71E4A023465D21F972CF83 includeInIndex 1 @@ -1914,180 +1861,233 @@ lastKnownFileType sourcecode.c.h name - NSMutableArray+MK_Misc.h + NSString+FontAwesome.h path - Source/NSArray/NSMutableArray+MK_Misc.h + BButton/Classes/NSString+FontAwesome.h sourceTree <group> - E4D4CB012EFBB4BA1D6D960E + DD84213F30BAB5A2245D17C4 - children - - 215B0289706C49C1C45F292F - A59D3778DB927E6858ED23A0 - + includeInIndex + 1 isa - PBXGroup - name - MKFoundationKit + PBXFileReference + lastKnownFileType + sourcecode.c.objc path - MKFoundationKit + Pods-FrameAccessor-dummy.m sourceTree <group> - E647CED747138C8B40CDF94D + DDC6A910C603168838F7B425 + + fileRef + F8A43EB5C83A0A6DB3620F19 + isa + PBXBuildFile + + E1AA403E61FF0F317815CC67 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - UIColor+BButton.h path - BButton/Classes/UIColor+BButton.h + libPods-BButton.a sourceTree - <group> + BUILT_PRODUCTS_DIR - E8C956064D21AE89AFE87116 + E1FEA8B5ABF5D67BA1E05793 fileRef - 41ED1E638EAAAA990A745103 + B0989FAA3C6FF4561C9C7280 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - ED5F7779B9AF9E7BC0907009 + E3FB835CE95261B905B708BE - buildActionMask - 2147483647 - files - - 6BF830D2244E3EA2285358E5 - 85B8FC3775938BECE90CD129 - 9FC084735184119190A28946 - + baseConfigurationReference + A3D6049E86E12252C54C0F31 + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + NO + DSTROOT + /tmp/xcodeproj.dst + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + Target Support Files/Pods-MKFoundationKit/Pods-MKFoundationKit-prefix.pch + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 7.1 + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + XCBuildConfiguration + name + Debug - EDA5EDC39AF4433FF0A43C30 + E7913533EBD1E7DA308F3DC1 buildActionMask 2147483647 files - 3DCF36FF802C5A42280BA8B6 - 8CA495BA301CCC827864DA96 - BF866D8E8EBDEEFCFCFEDD2A - DA4CB40F8D32DD149B9AC7FA + 6D5F7C699535954ADFCA12CC + 9293B5E515536B85777C37DF + 5B179B2ABD3388BF2E1C7113 + 57F11ED55DDE25ED5F3742EA isa PBXSourcesBuildPhase runOnlyForDeploymentPostprocessing 0 - EF3407671E4E897EBD21DAFD + E98FE032FF6257683A178608 - fileRef - EF662A7EA9F6248DB8E29EED - isa - PBXBuildFile - settings + baseConfigurationReference + 76886E21EE6B3599998A78A1 + buildSettings - COMPILER_FLAGS - -fobjc-arc + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + YES + DSTROOT + /tmp/xcodeproj.dst + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + Target Support Files/Pods-FrameAccessor/Pods-FrameAccessor-prefix.pch + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 7.1 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + VALIDATE_PRODUCT + YES + isa + XCBuildConfiguration + name + Release - EF662A7EA9F6248DB8E29EED + ED2902FAEDCE52FBD11FCF03 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc - name - NSArray+MK_Misc.m + text.plist.xml path - Source/NSArray/NSArray+MK_Misc.m + Pods-acknowledgements.plist sourceTree <group> - EFAAA06A0A1EC1746456DB70 + ED903040FB6863264D1BE3D8 - buildActionMask - 2147483647 - files + children - 7EE4071A20DAC4EA3EEC38E0 + 5F05D661447052C3FA2A1FEF + 1E8751852388407F5D30EB4C + 827ED69038E13256F2D92B7C + EF177C2EAA7F2B7C4381E3FF + 65FFB01C625A97995685B6E7 isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXGroup + sourceTree + <group> - EFF1C273568DC43C28E9BA34 + ED9795A9DD545EE8B8FB0B94 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + NSMutableArray+MK_Queue.h path - Pods-BButton-dummy.m + Source/NSArray/NSMutableArray+MK_Queue.h sourceTree <group> - F1B1A2DBD1FD26C036560DF2 - - containerPortal - 4081831429250433B34D8D00 - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 36B0016EEE2CC582A7893153 - remoteInfo - Pods-MKFoundationKit - - F1D0A43EE06E289AEF49C3BC + EEAF652046511CEEA9D71D79 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc + name + NSMutableArray+MK_Stack.m path - Pods-MKFoundationKit-Private.xcconfig + Source/NSArray/NSMutableArray+MK_Stack.m sourceTree <group> - F345C7F1DF986481CE68BFD8 - - fileRef - 912F62D2E8D4EBD86C0E6728 - isa - PBXBuildFile - - F3848843D5B97A96F579EAB6 + EF177C2EAA7F2B7C4381E3FF children - 383E6FA1EFCE875105BF7C27 - 352FCA75F97F674474AF876A - A77147BD9C4057B8B303B15D - 6D18BCB4CE8BB170540B0B18 + D7EB527A33BA844A0BE34221 + E1AA403E61FF0F317815CC67 + 52E255734C48FD62EF61E6ED + 9166B68ACC10DE362DA2FEBF isa PBXGroup @@ -2096,65 +2096,57 @@ sourceTree <group> - F663FD33BB05426DF30BE049 + F25F62DA18E721EE69E7D8BB - children - - 4BB16FEFD7D2F15C05125580 - 83158C63DDBF496F6D1EB9D0 - C9421A61E2978684FA58E29C - 1367208B257065400E090434 - E647CED747138C8B40CDF94D - 109E6BA0FD97C528310B3B4F - 4C85FBB5E55616156AC7BEEE - 1465BDE2B2369F2F5268F13D - + fileRef + 4B22604F983AB60429A7D355 isa - PBXGroup - name - BButton - path - BButton - sourceTree - <group> + PBXBuildFile - F702F3768CB67AA8E0F23BC4 + F4CDDAB15DE0F60328814B84 - children + buildConfigurations - 72DC613BC7FF4E2CE032E5F0 - 144D8ADA74C8B1D6D2D07027 - BD43196EEBFD9F83E69433CF - 8E82D0E1A25E28A0EEAB430A - 0C67D5CE08B349685187010F - 1D6C1C9213B4CF9FB6018FCA + C4143E983033F0F857BE14AC + 0EF241A32FCF5B97C7F91BDF + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXGroup + XCConfigurationList + + F8A43EB5C83A0A6DB3620F19 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h name - FrameAccessor + NSArray+MK_Block.h path - FrameAccessor + Source/NSArray/NSArray+MK_Block.h sourceTree <group> - F9FB9BFE37AA5020E67F26D3 + FB6767747A1B226FBB6AB7A2 - includeInIndex - 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + wrapper.framework name - NSMutableArray+MK_Queue.m + CoreGraphics.framework path - Source/NSArray/NSMutableArray+MK_Queue.m + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreGraphics.framework sourceTree - <group> + DEVELOPER_DIR rootObject - 4081831429250433B34D8D00 + 43E243E00171221A2788F8F6 diff --git a/GraphKit/Pods/Target Support Files/Pods/Pods-resources.sh b/GraphKit/Pods/Target Support Files/Pods/Pods-resources.sh index d33417a..a48916c 100755 --- a/GraphKit/Pods/Target Support Files/Pods/Pods-resources.sh +++ b/GraphKit/Pods/Target Support Files/Pods/Pods-resources.sh @@ -1,6 +1,8 @@ #!/bin/sh set -e +mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" @@ -29,6 +31,10 @@ install_resource() echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" ;; + *.xcmappingmodel) + echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" + xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + ;; *.xcassets) ;; /*) @@ -49,7 +55,7 @@ if [[ "${ACTION}" == "install" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ] then case "${TARGETED_DEVICE_FAMILY}" in 1,2) diff --git a/GraphKit/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/GraphKit/Pods/Target Support Files/Pods/Pods.debug.xcconfig index 29d393e..545c029 100644 --- a/GraphKit/Pods/Target Support Files/Pods/Pods.debug.xcconfig +++ b/GraphKit/Pods/Target Support Files/Pods/Pods.debug.xcconfig @@ -2,4 +2,5 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BButton" "${PODS_ROOT}/Headers/Public/FrameAccessor" "${PODS_ROOT}/Headers/Public/MKFoundationKit" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/BButton" -isystem "${PODS_ROOT}/Headers/Public/FrameAccessor" -isystem "${PODS_ROOT}/Headers/Public/MKFoundationKit" OTHER_LDFLAGS = -ObjC -l"Pods-BButton" -l"Pods-FrameAccessor" -l"Pods-MKFoundationKit" -framework "CoreGraphics" +OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS) PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/GraphKit/Pods/Target Support Files/Pods/Pods.release.xcconfig b/GraphKit/Pods/Target Support Files/Pods/Pods.release.xcconfig index 29d393e..545c029 100644 --- a/GraphKit/Pods/Target Support Files/Pods/Pods.release.xcconfig +++ b/GraphKit/Pods/Target Support Files/Pods/Pods.release.xcconfig @@ -2,4 +2,5 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/BButton" "${PODS_ROOT}/Headers/Public/FrameAccessor" "${PODS_ROOT}/Headers/Public/MKFoundationKit" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/BButton" -isystem "${PODS_ROOT}/Headers/Public/FrameAccessor" -isystem "${PODS_ROOT}/Headers/Public/MKFoundationKit" OTHER_LDFLAGS = -ObjC -l"Pods-BButton" -l"Pods-FrameAccessor" -l"Pods-MKFoundationKit" -framework "CoreGraphics" +OTHER_LIBTOOLFLAGS = $(OTHER_LDFLAGS) PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/Source/BarGraph/GKBar.m b/Source/BarGraph/GKBar.m index d445dd8..233cf0b 100644 --- a/Source/BarGraph/GKBar.m +++ b/Source/BarGraph/GKBar.m @@ -124,7 +124,7 @@ - (UIBezierPath *)_bezierPathWith:(CGFloat)value { - (CAShapeLayer *)_layerWithPath:(UIBezierPath *)path { CAShapeLayer *item = [CAShapeLayer layer]; item.fillColor = [[UIColor blackColor] CGColor]; - item.lineCap = kCALineCapButt; + item.lineCap = kCALineCapRound; item.lineWidth = self.frame.size.width; item.path = path.CGPath; item.strokeColor = [self.foregroundColor CGColor]; diff --git a/Source/BarGraph/GKBarGraph.h b/Source/BarGraph/GKBarGraph.h index c3c3e52..18c962e 100644 --- a/Source/BarGraph/GKBarGraph.h +++ b/Source/BarGraph/GKBarGraph.h @@ -42,6 +42,33 @@ @property (nonatomic, assign) CGFloat barWidth; @property (nonatomic, assign) CGFloat marginBar; +/** + * The Custom Font Name will be used if set otherwise the graph will default to the boldSystemFont + */ +@property (nonatomic, strong) NSString *customFontName; +/** + * The Custom Font Color will be used if set otherwise the graph will default to the lightGrayColor + */ +@property (nonatomic, strong) UIColor *customFontColor; +/** + * The Custom Font Size will be used if set otherwise the graph will default to the value 13 + */ +@property (nonatomic, assign) CGFloat customFontSize; + +@property (nonatomic, strong) UIView *underlineBar; + +/** + * The Custom Color of the Underline Bar Color + */ +@property (nonatomic, strong) UIColor *underlineBarColor; +/** + * Enables Hiding/Showing of an Underline beneath the Bar Graph + * Default is NO + */ +@property (nonatomic, assign) BOOL showUnderlineBar; + + + - (void)draw; - (void)reset; diff --git a/Source/BarGraph/GKBarGraph.m b/Source/BarGraph/GKBarGraph.m index b947002..7badb43 100644 --- a/Source/BarGraph/GKBarGraph.m +++ b/Source/BarGraph/GKBarGraph.m @@ -62,6 +62,12 @@ - (void)_init { self.barHeight = kDefaultBarHeight; self.barWidth = kDefaultBarWidth; self.marginBar = kDefaultBarMargin; + + self.customFontColor = [UIColor lightGrayColor]; + + self.customFontSize = 13; + self.underlineBarColor = [UIColor blackColor]; + self.showUnderlineBar = NO; } - (void)setAnimated:(BOOL)animated { @@ -96,8 +102,11 @@ - (void)_construct { if ([self _hasBars]) [self _removeBars]; if ([self _hasLabels]) [self _removeLabels]; + [self _removeUnderlineBar]; + [self _constructBars]; [self _constructLabels]; + [self _constructUnderlineBar]; [self _positionBars]; [self _positionLabels]; @@ -166,8 +175,17 @@ - (void)_constructLabels { CGRect frame = CGRectMake(0, 0, kDefaultLabelWidth, kDefaultLabelHeight); UILabel *item = [[UILabel alloc] initWithFrame:frame]; item.textAlignment = NSTextAlignmentCenter; - item.font = [UIFont boldSystemFontOfSize:13]; - item.textColor = [UIColor lightGrayColor]; + + UIFont *itemFont = [UIFont boldSystemFontOfSize:self.customFontSize]; + if (self.customFontName != nil && self.customFontName.length > 0) + { + itemFont = [UIFont fontWithName:self.customFontName size:self.customFontSize]; + } + item.font = itemFont; + + UIColor *itemTextColor = self.customFontColor; + item.textColor = itemTextColor; + item.text = [self.dataSource titleForBarAtIndex:idx]; [items addObject:item]; @@ -202,6 +220,38 @@ - (void)_positionLabels { }]; } +- (void)_constructUnderlineBar +{ + if (_showUnderlineBar) + { + self.underlineBar = [UIView new]; + + NSInteger count = [self.dataSource numberOfBars]; + CGFloat totalBarWidth = (self.barWidth + self.marginBar); + CGFloat graphWidth = totalBarWidth * count; + + CGFloat labelHeight = kDefaultLabelHeight; + CGFloat startY = (self.height - labelHeight); + CGFloat startX = [self _barStartX]; + startX -= self.marginBar; + startY -= 5; + + graphWidth += self.marginBar; + + [self.underlineBar setFrame:CGRectMake(startX, startY, graphWidth, 1)]; + + self.underlineBar.backgroundColor = _underlineBarColor; + + [self addSubview:self.underlineBar]; + } +} + +- (void)_removeUnderlineBar +{ + [self.underlineBar removeFromSuperview]; + self.underlineBar = nil; +} + - (void)_drawBars { __block NSInteger idx = 0; id source = self.dataSource; diff --git a/Source/LineGraph/GKLineGraph.h b/Source/LineGraph/GKLineGraph.h index 3ec3761..fa5ab48 100644 --- a/Source/LineGraph/GKLineGraph.h +++ b/Source/LineGraph/GKLineGraph.h @@ -43,6 +43,39 @@ @property (nonatomic, assign) CGFloat *minValue; @property (nonatomic, assign) BOOL startFromZero; +/** + * xAxis + * The Custom Font Name will be used if set otherwise the graph will default to the boldSystemFont + */ +@property (nonatomic, strong) NSString *xAxisCustomFontName; +/** + * xAxis + * The Custom Font Color will be used if set otherwise the graph will default to the lightGrayColor + */ +@property (nonatomic, strong) UIColor *xAxisCustomFontColor; +/** + * xAxis + * The Custom Font Size will be used if set otherwise the graph will default to the value 13 + */ +@property (nonatomic, assign) CGFloat xAxisCustomFontSize; + +/** + * yAxis + * The Custom Font Name will be used if set otherwise the graph will default to the boldSystemFont + */ +@property (nonatomic, strong) NSString *yAxisCustomFontName; +/** + * yAxis + * The Custom Font Color will be used if set otherwise the graph will default to the lightGrayColor + */ +@property (nonatomic, strong) UIColor *yAxisCustomFontColor; +/** + * yAxis + * The Custom Font Size will be used if set otherwise the graph will default to the value 13 + */ +@property (nonatomic, assign) CGFloat yAxisCustomFontSize; + + - (void)draw; - (void)reset; diff --git a/Source/LineGraph/GKLineGraph.m b/Source/LineGraph/GKLineGraph.m index 9eb9849..ede5800 100644 --- a/Source/LineGraph/GKLineGraph.m +++ b/Source/LineGraph/GKLineGraph.m @@ -70,6 +70,9 @@ - (void)_init { self.margin = kDefaultMargin; self.valueLabelCount = kDefaultValueLabelCount; self.clipsToBounds = YES; + + self.xAxisCustomFontSize = 12; + self.yAxisCustomFontSize = 12; } - (void)draw { @@ -102,8 +105,22 @@ - (void)_constructTitleLabels { CGRect frame = CGRectMake(0, 0, kDefaultLabelWidth, kDefaultLabelHeight); UILabel *item = [[UILabel alloc] initWithFrame:frame]; item.textAlignment = NSTextAlignmentCenter; - item.font = [UIFont boldSystemFontOfSize:12]; - item.textColor = [UIColor lightGrayColor]; + UIFont *itemFont = [UIFont boldSystemFontOfSize:self.yAxisCustomFontSize]; + if (self.yAxisCustomFontName != nil && self.yAxisCustomFontName.length > 0) + { + itemFont = [UIFont fontWithName:self.yAxisCustomFontName size:self.yAxisCustomFontSize]; + } + item.font = itemFont; + + UIColor *itemTextColor = [UIColor lightGrayColor]; + if (self.yAxisCustomFontColor != nil) + { + itemTextColor = self.yAxisCustomFontColor; + } + item.textColor = itemTextColor; + + item.adjustsFontSizeToFitWidth = YES; + item.text = [self.dataSource titleForLineAtIndex:idx]; [items addObject:item]; @@ -159,8 +176,19 @@ - (void)_constructValueLabels { CGRect frame = CGRectMake(0, 0, kDefaultLabelWidth, kDefaultLabelHeight); UILabel *item = [[UILabel alloc] initWithFrame:frame]; item.textAlignment = NSTextAlignmentRight; - item.font = [UIFont boldSystemFontOfSize:12]; - item.textColor = [UIColor lightGrayColor]; + UIFont *itemFont = [UIFont boldSystemFontOfSize:self.xAxisCustomFontSize]; + if (self.xAxisCustomFontName != nil && self.xAxisCustomFontName.length > 0) + { + itemFont = [UIFont fontWithName:self.xAxisCustomFontName size:self.xAxisCustomFontSize]; + } + item.font = itemFont; + + UIColor *itemTextColor = [UIColor lightGrayColor]; + if (self.xAxisCustomFontColor != nil) + { + itemTextColor = self.xAxisCustomFontColor; + } + item.textColor = itemTextColor; CGFloat value = [self _minValue] + (idx * [self _stepValueLabelY]); item.centerY = [self _positionYForLineValue:value]; @@ -168,6 +196,8 @@ - (void)_constructValueLabels { item.text = [@(ceil(value)) stringValue]; // item.text = [@(value) stringValue]; + item.adjustsFontSizeToFitWidth = YES; + [items addObject:item]; [self addSubview:item]; }