From 6caf7ea645477cbf75895accd2044060cf4f6610 Mon Sep 17 00:00:00 2001 From: Terry Worona Date: Sat, 21 Jun 2014 13:47:36 -0700 Subject: [PATCH] Added layout work --- Pods/Pods.xcodeproj/project.pbxproj | 1124 ++++++++-------- .../project.pbxproj | 1165 ++++++----------- .../Controllers/AQChartViewController.m | 165 --- .../Base/AQBaseNavigationController.h | 13 + .../Base/AQBaseNavigationController.m | 33 + .../{ => Charts}/AQChartViewController.h | 0 .../Charts/AQChartViewController.m | 191 +++ anscombe-quartet-ios/Delegate/AppDelegate.m | 3 +- 8 files changed, 1189 insertions(+), 1505 deletions(-) delete mode 100644 anscombe-quartet-ios/Controllers/AQChartViewController.m create mode 100644 anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.h create mode 100644 anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.m rename anscombe-quartet-ios/Controllers/{ => Charts}/AQChartViewController.h (100%) create mode 100644 anscombe-quartet-ios/Controllers/Charts/AQChartViewController.m diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 098a9f3..adbbdaa 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 46 objects - 049572A6AF1F4E5D875758AC + 071FBB0AE17B4A15AB117608 includeInIndex 1 @@ -18,29 +18,56 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + JBBarChartView.h path - Pods-JBChartView-prefix.pch + Classes/JBBarChartView.h sourceTree <group> - 07E8A6DFABB24E769DCBC597 + 0929B3D03E0445FFB058DFD4 - buildActionMask - 2147483647 - files - - DCE6EF4A8DB04F208F479F69 - 99964967B9834FFD907D36E9 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing + explicitFileType + archive.ar + includeInIndex 0 + isa + PBXFileReference + path + libPods.a + sourceTree + BUILT_PRODUCTS_DIR + + 0929BC36EEF34E769272E69C + + containerPortal + F346D3A4EE594672B70DD636 + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 3A1C23C5DC07406389F291DC + remoteInfo + Pods-JBChartView + + 0DD6B99165C94C45B93328B9 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.plist.xml + path + Pods-acknowledgements.plist + sourceTree + <group> - 185069B1F3FD40649112B4C1 + 0F9A0C7DD86341179009A563 baseConfigurationReference - 89B3F68BAA594D529809C1D1 + B06A5B303D8244A6B73826FC buildSettings ALWAYS_SEARCH_USER_PATHS @@ -88,10 +115,36 @@ name Debug - 1B36517E443D41BD807C1F9B + 1304F31A87A34B708375B578 + + buildActionMask + 2147483647 + files + + C1C3BF4DDBC649CDAEC8705C + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 154FF61715F242A8894BAC26 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + path + libPods-JBChartView.a + sourceTree + BUILT_PRODUCTS_DIR + + 16CDD182DAFD4E6884F23805 baseConfigurationReference - 7C66A16FEAA0404E8B755E28 + 3F103151862C4D0291569C4A buildSettings ALWAYS_SEARCH_USER_PATHS @@ -138,66 +191,47 @@ name Release - 2147C939B9C744589C8C099A - - buildConfigurations - - 2590D80D49584C4497304C50 - 1B36517E443D41BD807C1F9B - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 23CE6FD43DAD421EBE5AD227 + 24ADB7E8A01049A98681CEB6 - explicitFileType - archive.ar - includeInIndex - 0 + fileRef + 301502E8AD39419B86020A6A isa - PBXFileReference - path - libPods-JBChartView.a - sourceTree - BUILT_PRODUCTS_DIR + PBXBuildFile - 2590D80D49584C4497304C50 + 296DB48974534F349B2FD985 baseConfigurationReference - 7C66A16FEAA0404E8B755E28 + B06A5B303D8244A6B73826FC buildSettings ALWAYS_SEARCH_USER_PATHS NO COPY_PHASE_STRIP - NO + YES DSTROOT /tmp/xcodeproj.dst GCC_C_LANGUAGE_STANDARD gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 GCC_PRECOMPILE_PREFIX_HEADER YES - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO + GCC_PREFIX_HEADER + Pods-JBChartView-prefix.pch GCC_VERSION com.apple.compilers.llvm.clang.1_0 INSTALL_PATH $(BUILT_PRODUCTS_DIR) IPHONEOS_DEPLOYMENT_TARGET 7.0 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + OTHER_LDFLAGS PRODUCT_NAME @@ -208,26 +242,15 @@ iphoneos SKIP_INSTALL YES + VALIDATE_PRODUCT + YES isa XCBuildConfiguration name - Debug - - 30FE7CD6BBB246B19A8BFDFC - - children - - 5244F07AAA244AA095108678 - - isa - PBXGroup - name - Targets Support Files - sourceTree - <group> + Release - 33730EA5D4CC435BA4320322 + 301502E8AD39419B86020A6A isa PBXFileReference @@ -240,140 +263,133 @@ sourceTree DEVELOPER_DIR - 33AEA816A29D44E5A110C6C2 - - fileRef - 9939576C4A8744AEA76CB936 - isa - PBXBuildFile - - 35063BCE2F18440D85FA42EA - - fileRef - 71B3B11B85064E8788B32416 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - - - 4156ABE9B13B473BB41EAE94 - - buildConfigurations - - 7C9005D47C8E4A99B4278A85 - B56085AE2106452DB9847FB9 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 421C6397BF2E40DD804A714B + 35E4299DD8AE4685B5F0633C includeInIndex 1 isa PBXFileReference lastKnownFileType - text + text.script.sh path - Pods-acknowledgements.markdown + Pods-resources.sh sourceTree <group> - 4626D83E06494F649260DDD3 + 35E9EC9451BE4D708C8F59CA + + buildActionMask + 2147483647 + files + + C276564EC0B44E8DB1758C8E + 871265C74BBE4F8D8979E0B1 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 36BB166425DA4CD5BCDE19AE includeInIndex 1 isa PBXFileReference lastKnownFileType - text - name - Podfile + text.xcconfig path - ../Podfile + Pods-JBChartView.xcconfig sourceTree - SOURCE_ROOT - xcLanguageSpecificationIdentifier - xcode.lang.ruby - - 51CB40155B01454EA8E18E04 - - isa - PBXTargetDependency - target - 56000141BEA947D6A27C0710 - targetProxy - 6C7674027F4341019CD43172 + <group> - 5244F07AAA244AA095108678 + 3A1C23C5DC07406389F291DC - children + buildConfigurationList + C0942ECABAE54AE3AEAC3D24 + buildPhases - 7C66A16FEAA0404E8B755E28 - 421C6397BF2E40DD804A714B - B06F2019FAD34583944A4667 - D36C97461CBA4BAFA0D1D8BE - AFEB7E7F58C746618B9A6FBB - F3BCFA3A414B4136B88A08E6 + A65D67BFADF24B59859F7CA2 + AF16D80EB4784E2BAF01B87F + F3AD961D37D4420C81100FD1 + buildRules + + dependencies + isa - PBXGroup + PBXNativeTarget name - Pods - sourceTree - <group> + Pods-JBChartView + productName + Pods-JBChartView + productReference + 154FF61715F242A8894BAC26 + productType + com.apple.product-type.library.static - 5299503DE3C346398E62E27A + 3AD7FA2C723A4345B00378B0 + + fileRef + 5ACF78B3B1A34D53BF527BF9 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fobjc-arc + + + 3C349D49C662403790D96523 - baseConfigurationReference - 89B3F68BAA594D529809C1D1 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 + 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_PRECOMPILE_PREFIX_HEADER + GCC_WARN_64_TO_32_BIT_CONVERSION YES - GCC_PREFIX_HEADER - Pods-JBChartView-prefix.pch - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - 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 + 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.0 + STRIP_INSTALLED_PRODUCT + NO VALIDATE_PRODUCT YES @@ -382,89 +398,101 @@ name Release - 5481FCB30C0F484EA60171C1 + 3F103151862C4D0291569C4A includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc - name - JBChartView.m + text.xcconfig path - Classes/JBChartView.m + Pods.xcconfig sourceTree <group> - 54F192071BB647569A543DFA + 3F4D8A7BB4BA47FDB0FECDC0 + + fileRef + DA71524223AC41608E274A26 + isa + PBXBuildFile + + 4497C72C54B24BDC91CE1653 children - C5FEE16BC7DC4DABBD60C930 - 23CE6FD43DAD421EBE5AD227 + 4B764BC68EDB47928B2E3EB9 isa PBXGroup name - Products + Targets Support Files sourceTree <group> - 56000141BEA947D6A27C0710 + 484046647F094FB1B40E4CAD - buildConfigurationList - BCBEB53A3EA242618C2EEB13 - buildPhases + children - 59CE3032707B4DCDB766E823 - D941AAAD5CEB437398DC8186 - D054AE5720514CC0876475EE + 6431007BB25F46929670A40D - buildRules - - dependencies - isa - PBXNativeTarget + PBXGroup name - Pods-JBChartView - productName - Pods-JBChartView - productReference - 23CE6FD43DAD421EBE5AD227 - productType - com.apple.product-type.library.static + Frameworks + sourceTree + <group> - 59CE3032707B4DCDB766E823 + 4B764BC68EDB47928B2E3EB9 - buildActionMask - 2147483647 - files + children - 35063BCE2F18440D85FA42EA - 68D43901326942E582B36B09 - C908737EC3A1470AB20A5AEE - 9E69F083A7624964A7515A34 + 3F103151862C4D0291569C4A + 82D271208EFF4FBC883AE294 + 0DD6B99165C94C45B93328B9 + EF997CE53BF6421BB959F3EE + 82C2FB0ABDAA46A18C6675CA + 35E4299DD8AE4685B5F0633C isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXGroup + name + Pods + sourceTree + <group> - 68D43901326942E582B36B09 + 4F7A0FC455FC4C5A9217AD4A - fileRef - 5481FCB30C0F484EA60171C1 isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - + PBXTargetDependency + target + 3A1C23C5DC07406389F291DC + targetProxy + 0929BC36EEF34E769272E69C + + 53F51E8D5D1D441AA430F3CD + + children + + 071FBB0AE17B4A15AB117608 + 6BEC525B6CBD49B4AB3C0061 + E793ED3F54E14F7AB2C8B033 + C7B88DEE3FBE4137AB1DE8A1 + D96AB224D4E74BC0819ABE87 + 5ACF78B3B1A34D53BF527BF9 + E4E335620357484C8D88D3E3 + + isa + PBXGroup + name + JBChartView + path + JBChartView + sourceTree + <group> - 6A3E8B63250646669B87EBEE + 5ACF78B3B1A34D53BF527BF9 includeInIndex 1 @@ -479,20 +507,62 @@ sourceTree <group> - 6C7674027F4341019CD43172 + 5C98DAD5908340E584C36DBC - containerPortal - 93CD4D5DFE6A4E35AA9C1302 + fileRef + C7B88DEE3FBE4137AB1DE8A1 isa - PBXContainerItemProxy - proxyType + PBXBuildFile + settings + + COMPILER_FLAGS + -fobjc-arc + + + 6431007BB25F46929670A40D + + children + + 301502E8AD39419B86020A6A + + isa + PBXGroup + name + iOS + sourceTree + <group> + + 67BD8A96A25C4CE69F1CF227 + + children + + 53F51E8D5D1D441AA430F3CD + + isa + PBXGroup + name + Pods + sourceTree + <group> + + 67DC865FD9D24D19AEFAFC58 + + includeInIndex 1 - remoteGlobalIDString - 56000141BEA947D6A27C0710 - remoteInfo - Pods-JBChartView + isa + PBXFileReference + lastKnownFileType + text + name + Podfile + path + ../Podfile + sourceTree + SOURCE_ROOT + xcLanguageSpecificationIdentifier + xcode.lang.ruby - 71B3B11B85064E8788B32416 + 6BEC525B6CBD49B4AB3C0061 includeInIndex 1 @@ -507,14 +577,62 @@ sourceTree <group> - 7516558644B94AB982CCA853 + 6E41AF43D6F0401AB24EABCA + + buildConfigurations + + 9E96CCE765F941699BE4571D + 3C349D49C662403790D96523 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 7D910102BCE74240B8BBEE26 + + children + + 0929B3D03E0445FFB058DFD4 + 154FF61715F242A8894BAC26 + + isa + PBXGroup + name + Products + sourceTree + <group> + + 7E5E516AA0894786A3F25D98 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + Pods-JBChartView-prefix.pch + sourceTree + <group> + + 7E6AAE667D8E4A4CA22D4E0F + + fileRef + D96AB224D4E74BC0819ABE87 + isa + PBXBuildFile + + 7E9E73E3894849B68091AC0B fileRef - 9FB37AEB2BB94C339E4E0F95 + 071FBB0AE17B4A15AB117608 isa PBXBuildFile - 7A7911FC0A9743A8A55B0735 + 82C2FB0ABDAA46A18C6675CA includeInIndex 1 @@ -522,27 +640,46 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - JBLineChartView.h path - Classes/JBLineChartView.h + Pods-environment.h sourceTree <group> - 7C66A16FEAA0404E8B755E28 + 82D271208EFF4FBC883AE294 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + text path - Pods.xcconfig + Pods-acknowledgements.markdown sourceTree <group> - 7C9005D47C8E4A99B4278A85 + 871265C74BBE4F8D8979E0B1 + + fileRef + 154FF61715F242A8894BAC26 + isa + PBXBuildFile + + 8B7FBA7E442847E9B9876066 + + buildConfigurations + + B7410BD4CCC54520BCC3006D + 16CDD182DAFD4E6884F23805 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 9E96CCE765F941699BE4571D buildSettings @@ -609,59 +746,36 @@ name Debug - 7D00F1353E25437CA729BC63 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-JBChartView.xcconfig - sourceTree - <group> - - 8205282762894C4C8BB3F128 + A65D67BFADF24B59859F7CA2 - buildConfigurationList - 2147C939B9C744589C8C099A - buildPhases - - A652D00E87D94D1D9FFE395B - 07E8A6DFABB24E769DCBC597 - - buildRules - - dependencies + buildActionMask + 2147483647 + files - 51CB40155B01454EA8E18E04 + CF70B484965042B9A24062B1 + 5C98DAD5908340E584C36DBC + 3AD7FA2C723A4345B00378B0 + 3F4D8A7BB4BA47FDB0FECDC0 isa - PBXNativeTarget - name - Pods - productName - Pods - productReference - C5FEE16BC7DC4DABBD60C930 - productType - com.apple.product-type.library.static + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 824C20564C9840D991539FB3 + AF16D80EB4784E2BAF01B87F - children + buildActionMask + 2147483647 + files - C490DDC84FE2443382967B17 + 24ADB7E8A01049A98681CEB6 isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 89B3F68BAA594D529809C1D1 + B06A5B303D8244A6B73826FC includeInIndex 1 @@ -674,117 +788,159 @@ sourceTree <group> - 93CD4D5DFE6A4E35AA9C1302 + B7410BD4CCC54520BCC3006D - attributes + baseConfigurationReference + 3F103151862C4D0291569C4A + buildSettings - LastUpgradeCheck - 0510 + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + NO + DSTROOT + /tmp/xcodeproj.dst + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + OTHER_LDFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES - buildConfigurationList - 4156ABE9B13B473BB41EAE94 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 isa - PBXProject - knownRegions + XCBuildConfiguration + name + Debug + + BD1B072E8B0D4A9F940AF99B + + buildConfigurationList + 8B7FBA7E442847E9B9876066 + buildPhases - en + 1304F31A87A34B708375B578 + 35E9EC9451BE4D708C8F59CA - mainGroup - E0D7F829BB8E4A528EBA0C18 - productRefGroup - 54F192071BB647569A543DFA - projectDirPath - - projectReferences + buildRules - projectRoot - - targets + dependencies - 8205282762894C4C8BB3F128 - 56000141BEA947D6A27C0710 + 4F7A0FC455FC4C5A9217AD4A + isa + PBXNativeTarget + name + Pods + productName + Pods + productReference + 0929B3D03E0445FFB058DFD4 + productType + com.apple.product-type.library.static - 9939576C4A8744AEA76CB936 + C0942ECABAE54AE3AEAC3D24 - includeInIndex - 1 + buildConfigurations + + 0F9A0C7DD86341179009A563 + 296DB48974534F349B2FD985 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - JBBarChartView.h - path - Classes/JBBarChartView.h - sourceTree - <group> + XCConfigurationList - 99964967B9834FFD907D36E9 + C1C3BF4DDBC649CDAEC8705C fileRef - 23CE6FD43DAD421EBE5AD227 + EF997CE53BF6421BB959F3EE isa PBXBuildFile - 9E69F083A7624964A7515A34 + C276564EC0B44E8DB1758C8E fileRef - CDCFC1F0CE4A4BD5A3711BCE + 301502E8AD39419B86020A6A isa PBXBuildFile - 9F2457D8BD9D4BC8B625FD58 + C4D09765BE8349ACAE6D0CDA + + fileRef + E793ED3F54E14F7AB2C8B033 + isa + PBXBuildFile + + C79BEB1E374648F7A58369B3 children - 7D00F1353E25437CA729BC63 - 89B3F68BAA594D529809C1D1 - CDCFC1F0CE4A4BD5A3711BCE - 049572A6AF1F4E5D875758AC + 67DC865FD9D24D19AEFAFC58 + 484046647F094FB1B40E4CAD + 67BD8A96A25C4CE69F1CF227 + 7D910102BCE74240B8BBEE26 + 4497C72C54B24BDC91CE1653 isa PBXGroup - name - Support Files sourceTree - SOURCE_ROOT + <group> - 9FB37AEB2BB94C339E4E0F95 + C7B88DEE3FBE4137AB1DE8A1 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - JBChartView.h + JBChartView.m path - Classes/JBChartView.h + Classes/JBChartView.m sourceTree <group> - A652D00E87D94D1D9FFE395B + CF70B484965042B9A24062B1 - buildActionMask - 2147483647 - files - - B6DB998A984A42C191B5DA55 - + fileRef + 6BEC525B6CBD49B4AB3C0061 isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile + settings + + COMPILER_FLAGS + -fobjc-arc + - AFEB7E7F58C746618B9A6FBB + D96AB224D4E74BC0819ABE87 includeInIndex 1 @@ -792,142 +948,58 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + JBLineChartView.h path - Pods-environment.h + Classes/JBLineChartView.h sourceTree <group> - B06F2019FAD34583944A4667 + DA71524223AC41608E274A26 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.plist.xml + sourcecode.c.objc path - Pods-acknowledgements.plist + Pods-JBChartView-dummy.m sourceTree <group> - B56085AE2106452DB9847FB9 - - 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_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.0 - STRIP_INSTALLED_PRODUCT - NO - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - B6DB998A984A42C191B5DA55 - - fileRef - D36C97461CBA4BAFA0D1D8BE - isa - PBXBuildFile - - BCBEB53A3EA242618C2EEB13 - - buildConfigurations - - 185069B1F3FD40649112B4C1 - 5299503DE3C346398E62E27A - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - C490DDC84FE2443382967B17 + E4E335620357484C8D88D3E3 children - 33730EA5D4CC435BA4320322 + 36BB166425DA4CD5BCDE19AE + B06A5B303D8244A6B73826FC + DA71524223AC41608E274A26 + 7E5E516AA0894786A3F25D98 isa PBXGroup name - iOS + Support Files sourceTree - <group> + SOURCE_ROOT - C5FEE16BC7DC4DABBD60C930 + E793ED3F54E14F7AB2C8B033 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + JBChartView.h path - libPods.a + Classes/JBChartView.h sourceTree - BUILT_PRODUCTS_DIR - - C908737EC3A1470AB20A5AEE - - fileRef - 6A3E8B63250646669B87EBEE - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc - + <group> - CDCFC1F0CE4A4BD5A3711BCE + EF997CE53BF6421BB959F3EE includeInIndex 1 @@ -936,136 +1008,64 @@ lastKnownFileType sourcecode.c.objc path - Pods-JBChartView-dummy.m + Pods-dummy.m sourceTree <group> - CF32DD05B6F54C9693F6CF11 + F346D3A4EE594672B70DD636 - children - - CF5A95948B5B44DBA54A3D4D - + attributes + + LastUpgradeCheck + 0510 + + buildConfigurationList + 6E41AF43D6F0401AB24EABCA + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 isa - PBXGroup - name - Pods - sourceTree - <group> - - CF5A95948B5B44DBA54A3D4D - - children + PBXProject + knownRegions - 9939576C4A8744AEA76CB936 - 71B3B11B85064E8788B32416 - 9FB37AEB2BB94C339E4E0F95 - 5481FCB30C0F484EA60171C1 - 7A7911FC0A9743A8A55B0735 - 6A3E8B63250646669B87EBEE - 9F2457D8BD9D4BC8B625FD58 + en - isa - PBXGroup - name - JBChartView - path - JBChartView - sourceTree - <group> - - D054AE5720514CC0876475EE - - buildActionMask - 2147483647 - files + mainGroup + C79BEB1E374648F7A58369B3 + productRefGroup + 7D910102BCE74240B8BBEE26 + projectDirPath + + projectReferences + + projectRoot + + targets - 33AEA816A29D44E5A110C6C2 - 7516558644B94AB982CCA853 - E67EAD89B1314BD98C1078D6 + BD1B072E8B0D4A9F940AF99B + 3A1C23C5DC07406389F291DC - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - D36C97461CBA4BAFA0D1D8BE - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-dummy.m - sourceTree - <group> - - D941AAAD5CEB437398DC8186 + F3AD961D37D4420C81100FD1 buildActionMask 2147483647 files - EECB91FA0DBC47C894466C62 + 7E9E73E3894849B68091AC0B + C4D09765BE8349ACAE6D0CDA + 7E6AAE667D8E4A4CA22D4E0F isa - PBXFrameworksBuildPhase + PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - DCE6EF4A8DB04F208F479F69 - - fileRef - 33730EA5D4CC435BA4320322 - isa - PBXBuildFile - - E0D7F829BB8E4A528EBA0C18 - - children - - 4626D83E06494F649260DDD3 - 824C20564C9840D991539FB3 - CF32DD05B6F54C9693F6CF11 - 54F192071BB647569A543DFA - 30FE7CD6BBB246B19A8BFDFC - - isa - PBXGroup - sourceTree - <group> - - E67EAD89B1314BD98C1078D6 - - fileRef - 7A7911FC0A9743A8A55B0735 - isa - PBXBuildFile - - EECB91FA0DBC47C894466C62 - - fileRef - 33730EA5D4CC435BA4320322 - isa - PBXBuildFile - - F3BCFA3A414B4136B88A08E6 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.script.sh - path - Pods-resources.sh - sourceTree - <group> - rootObject - 93CD4D5DFE6A4E35AA9C1302 + F346D3A4EE594672B70DD636 diff --git a/anscombe-quartet-ios.xcodeproj/project.pbxproj b/anscombe-quartet-ios.xcodeproj/project.pbxproj index 82d7f78..f55c4e5 100644 --- a/anscombe-quartet-ios.xcodeproj/project.pbxproj +++ b/anscombe-quartet-ios.xcodeproj/project.pbxproj @@ -1,777 +1,388 @@ - - - - - archiveVersion - 1 - classes - - objectVersion - 46 - objects - - 132959D29A9747A790B633FF - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Copy Pods Resources - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Pods-resources.sh" - - showEnvVarsInLog - 0 - - 384ED5DE99B94CB1837CF580 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods.xcconfig - path - Pods/Pods.xcconfig - sourceTree - <group> - - 7B973261D2C24131AD99E38D - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods.a - sourceTree - BUILT_PRODUCTS_DIR - - 9B769B4E1946C4EF00581A07 - - children - - 9B769B601946C4EF00581A07 - 9B769B591946C4EF00581A07 - 9B769B581946C4EF00581A07 - 384ED5DE99B94CB1837CF580 - - isa - PBXGroup - sourceTree - <group> - - 9B769B4F1946C4EF00581A07 - - attributes - - LastUpgradeCheck - 0510 - ORGANIZATIONNAME - Jawbone - - buildConfigurationList - 9B769B521946C4EF00581A07 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - Base - - mainGroup - 9B769B4E1946C4EF00581A07 - productRefGroup - 9B769B581946C4EF00581A07 - projectDirPath - - projectReferences - - projectRoot - - targets - - 9B769B561946C4EF00581A07 - - - 9B769B521946C4EF00581A07 - - buildConfigurations - - 9B769B871946C4EF00581A07 - 9B769B881946C4EF00581A07 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 9B769B531946C4EF00581A07 - - buildActionMask - 2147483647 - files - - 9B9881871946CF3B009304E2 - 9B98818E1946CF58009304E2 - 9B769B671946C4EF00581A07 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 9B769B541946C4EF00581A07 - - buildActionMask - 2147483647 - files - - 9B769B5D1946C4EF00581A07 - 9B769B5F1946C4EF00581A07 - 9B769B5B1946C4EF00581A07 - AFBA96371DE84A2184837E81 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 9B769B551946C4EF00581A07 - - buildActionMask - 2147483647 - files - - 9B769B731946C4EF00581A07 - 9B769B651946C4EF00581A07 - - isa - PBXResourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 9B769B561946C4EF00581A07 - - buildConfigurationList - 9B769B891946C4EF00581A07 - buildPhases - - C076F2AF83A64C7CB7814868 - 9B769B531946C4EF00581A07 - 9B769B541946C4EF00581A07 - 9B769B551946C4EF00581A07 - 132959D29A9747A790B633FF - - buildRules - - dependencies - - isa - PBXNativeTarget - name - anscombe-quartet-ios - productName - anscombe-quartet-ios - productReference - 9B769B571946C4EF00581A07 - productType - com.apple.product-type.application - - 9B769B571946C4EF00581A07 - - explicitFileType - wrapper.application - includeInIndex - 0 - isa - PBXFileReference - path - anscombe-quartet-ios.app - sourceTree - BUILT_PRODUCTS_DIR - - 9B769B581946C4EF00581A07 - - children - - 9B769B571946C4EF00581A07 - - isa - PBXGroup - name - Products - sourceTree - <group> - - 9B769B591946C4EF00581A07 - - children - - 9B769B5A1946C4EF00581A07 - 9B769B5C1946C4EF00581A07 - 9B769B5E1946C4EF00581A07 - 9B769B791946C4EF00581A07 - 7B973261D2C24131AD99E38D - - isa - PBXGroup - name - Frameworks - sourceTree - <group> - - 9B769B5A1946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Foundation.framework - path - System/Library/Frameworks/Foundation.framework - sourceTree - SDKROOT - - 9B769B5B1946C4EF00581A07 - - fileRef - 9B769B5A1946C4EF00581A07 - isa - PBXBuildFile - - 9B769B5C1946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreGraphics.framework - path - System/Library/Frameworks/CoreGraphics.framework - sourceTree - SDKROOT - - 9B769B5D1946C4EF00581A07 - - fileRef - 9B769B5C1946C4EF00581A07 - isa - PBXBuildFile - - 9B769B5E1946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - UIKit.framework - path - System/Library/Frameworks/UIKit.framework - sourceTree - SDKROOT - - 9B769B5F1946C4EF00581A07 - - fileRef - 9B769B5E1946C4EF00581A07 - isa - PBXBuildFile - - 9B769B601946C4EF00581A07 - - children - - 9B98818B1946CF58009304E2 - 9B9881841946CF3B009304E2 - 9B769B721946C4EF00581A07 - 9B769B611946C4EF00581A07 - - isa - PBXGroup - path - anscombe-quartet-ios - sourceTree - <group> - - 9B769B611946C4EF00581A07 - - children - - 9B769B621946C4EF00581A07 - 9B769B631946C4EF00581A07 - 9B769B661946C4EF00581A07 - 9B769B681946C4EF00581A07 - - isa - PBXGroup - name - Supporting Files - sourceTree - <group> - - 9B769B621946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - anscombe-quartet-ios-Info.plist - sourceTree - <group> - - 9B769B631946C4EF00581A07 - - children - - 9B769B641946C4EF00581A07 - - isa - PBXVariantGroup - name - InfoPlist.strings - sourceTree - <group> - - 9B769B641946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - text.plist.strings - name - en - path - en.lproj/InfoPlist.strings - sourceTree - <group> - - 9B769B651946C4EF00581A07 - - fileRef - 9B769B631946C4EF00581A07 - isa - PBXBuildFile - - 9B769B661946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - main.m - sourceTree - <group> - - 9B769B671946C4EF00581A07 - - fileRef - 9B769B661946C4EF00581A07 - isa - PBXBuildFile - - 9B769B681946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - anscombe-quartet-ios-Prefix.pch - sourceTree - <group> - - 9B769B721946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - folder.assetcatalog - path - Images.xcassets - sourceTree - <group> - - 9B769B731946C4EF00581A07 - - fileRef - 9B769B721946C4EF00581A07 - isa - PBXBuildFile - - 9B769B791946C4EF00581A07 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - XCTest.framework - path - Library/Frameworks/XCTest.framework - sourceTree - DEVELOPER_DIR - - 9B769B871946C4EF00581A07 - - 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_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - COPY_PHASE_STRIP - NO - 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_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES_AGGRESSIVE - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - ONLY_ACTIVE_ARCH - YES - SDKROOT - iphoneos - - isa - XCBuildConfiguration - name - Debug - - 9B769B881946C4EF00581A07 - - 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_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - COPY_PHASE_STRIP - YES - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES_AGGRESSIVE - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - SDKROOT - iphoneos - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - 9B769B891946C4EF00581A07 - - buildConfigurations - - 9B769B8A1946C4EF00581A07 - 9B769B8B1946C4EF00581A07 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 9B769B8A1946C4EF00581A07 - - baseConfigurationReference - 384ED5DE99B94CB1837CF580 - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - anscombe-quartet-ios/anscombe-quartet-ios-Prefix.pch - INFOPLIST_FILE - anscombe-quartet-ios/anscombe-quartet-ios-Info.plist - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Debug - - 9B769B8B1946C4EF00581A07 - - baseConfigurationReference - 384ED5DE99B94CB1837CF580 - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - anscombe-quartet-ios/anscombe-quartet-ios-Prefix.pch - INFOPLIST_FILE - anscombe-quartet-ios/anscombe-quartet-ios-Info.plist - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Release - - 9B9881841946CF3B009304E2 - - children - - 9B9881851946CF3B009304E2 - 9B9881861946CF3B009304E2 - - isa - PBXGroup - path - Delegate - sourceTree - <group> - - 9B9881851946CF3B009304E2 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - AppDelegate.h - sourceTree - <group> - - 9B9881861946CF3B009304E2 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - AppDelegate.m - sourceTree - <group> - - 9B9881871946CF3B009304E2 - - fileRef - 9B9881861946CF3B009304E2 - isa - PBXBuildFile - - 9B98818B1946CF58009304E2 - - children - - 9B98818C1946CF58009304E2 - 9B98818D1946CF58009304E2 - - isa - PBXGroup - path - Controllers - sourceTree - <group> - - 9B98818C1946CF58009304E2 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - AQChartViewController.h - sourceTree - <group> - - 9B98818D1946CF58009304E2 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - AQChartViewController.m - sourceTree - <group> - - 9B98818E1946CF58009304E2 - - fileRef - 9B98818D1946CF58009304E2 - isa - PBXBuildFile - - AFBA96371DE84A2184837E81 - - fileRef - 7B973261D2C24131AD99E38D - isa - PBXBuildFile - - C076F2AF83A64C7CB7814868 - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Check Pods Manifest.lock - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null -if [[ $? != 0 ]] ; then - cat << EOM -error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. -EOM - exit 1 -fi - - showEnvVarsInLog - 0 - - - rootObject - 9B769B4F1946C4EF00581A07 - - +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 9B769B5B1946C4EF00581A07 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B769B5A1946C4EF00581A07 /* Foundation.framework */; }; + 9B769B5D1946C4EF00581A07 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B769B5C1946C4EF00581A07 /* CoreGraphics.framework */; }; + 9B769B5F1946C4EF00581A07 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B769B5E1946C4EF00581A07 /* UIKit.framework */; }; + 9B769B651946C4EF00581A07 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9B769B631946C4EF00581A07 /* InfoPlist.strings */; }; + 9B769B671946C4EF00581A07 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B769B661946C4EF00581A07 /* main.m */; }; + 9B769B731946C4EF00581A07 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9B769B721946C4EF00581A07 /* Images.xcassets */; }; + 9B9881871946CF3B009304E2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B9881861946CF3B009304E2 /* AppDelegate.m */; }; + 9BAF61AE19561EB200482F21 /* AQChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAF61AD19561EB200482F21 /* AQChartViewController.m */; }; + 9BAF61B519561EDF00482F21 /* AQBaseNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BAF61B419561EDF00482F21 /* AQBaseNavigationController.m */; }; + AFBA96371DE84A2184837E81 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B973261D2C24131AD99E38D /* libPods.a */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 384ED5DE99B94CB1837CF580 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = ""; }; + 7B973261D2C24131AD99E38D /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 9B769B571946C4EF00581A07 /* anscombe-quartet-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "anscombe-quartet-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9B769B5A1946C4EF00581A07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 9B769B5C1946C4EF00581A07 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 9B769B5E1946C4EF00581A07 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 9B769B621946C4EF00581A07 /* anscombe-quartet-ios-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "anscombe-quartet-ios-Info.plist"; sourceTree = ""; }; + 9B769B641946C4EF00581A07 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 9B769B661946C4EF00581A07 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 9B769B681946C4EF00581A07 /* anscombe-quartet-ios-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "anscombe-quartet-ios-Prefix.pch"; sourceTree = ""; }; + 9B769B721946C4EF00581A07 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 9B769B791946C4EF00581A07 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 9B9881851946CF3B009304E2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 9B9881861946CF3B009304E2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 9BAF61AC19561EB200482F21 /* AQChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AQChartViewController.h; sourceTree = ""; }; + 9BAF61AD19561EB200482F21 /* AQChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AQChartViewController.m; sourceTree = ""; }; + 9BAF61B319561EDF00482F21 /* AQBaseNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AQBaseNavigationController.h; sourceTree = ""; }; + 9BAF61B419561EDF00482F21 /* AQBaseNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AQBaseNavigationController.m; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 9B769B541946C4EF00581A07 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9B769B5D1946C4EF00581A07 /* CoreGraphics.framework in Frameworks */, + 9B769B5F1946C4EF00581A07 /* UIKit.framework in Frameworks */, + 9B769B5B1946C4EF00581A07 /* Foundation.framework in Frameworks */, + AFBA96371DE84A2184837E81 /* libPods.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9B769B4E1946C4EF00581A07 = { + isa = PBXGroup; + children = ( + 9B769B601946C4EF00581A07 /* anscombe-quartet-ios */, + 9B769B591946C4EF00581A07 /* Frameworks */, + 9B769B581946C4EF00581A07 /* Products */, + 384ED5DE99B94CB1837CF580 /* Pods.xcconfig */, + ); + sourceTree = ""; + }; + 9B769B581946C4EF00581A07 /* Products */ = { + isa = PBXGroup; + children = ( + 9B769B571946C4EF00581A07 /* anscombe-quartet-ios.app */, + ); + name = Products; + sourceTree = ""; + }; + 9B769B591946C4EF00581A07 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 9B769B5A1946C4EF00581A07 /* Foundation.framework */, + 9B769B5C1946C4EF00581A07 /* CoreGraphics.framework */, + 9B769B5E1946C4EF00581A07 /* UIKit.framework */, + 9B769B791946C4EF00581A07 /* XCTest.framework */, + 7B973261D2C24131AD99E38D /* libPods.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 9B769B601946C4EF00581A07 /* anscombe-quartet-ios */ = { + isa = PBXGroup; + children = ( + 9BAF61AA19561EB200482F21 /* Controllers */, + 9B9881841946CF3B009304E2 /* Delegate */, + 9B769B721946C4EF00581A07 /* Images.xcassets */, + 9B769B611946C4EF00581A07 /* Supporting Files */, + ); + path = "anscombe-quartet-ios"; + sourceTree = ""; + }; + 9B769B611946C4EF00581A07 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 9B769B621946C4EF00581A07 /* anscombe-quartet-ios-Info.plist */, + 9B769B631946C4EF00581A07 /* InfoPlist.strings */, + 9B769B661946C4EF00581A07 /* main.m */, + 9B769B681946C4EF00581A07 /* anscombe-quartet-ios-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 9B9881841946CF3B009304E2 /* Delegate */ = { + isa = PBXGroup; + children = ( + 9B9881851946CF3B009304E2 /* AppDelegate.h */, + 9B9881861946CF3B009304E2 /* AppDelegate.m */, + ); + path = Delegate; + sourceTree = ""; + }; + 9BAF61AA19561EB200482F21 /* Controllers */ = { + isa = PBXGroup; + children = ( + 9BAF61B219561EDF00482F21 /* Base */, + 9BAF61AB19561EB200482F21 /* Charts */, + ); + path = Controllers; + sourceTree = ""; + }; + 9BAF61AB19561EB200482F21 /* Charts */ = { + isa = PBXGroup; + children = ( + 9BAF61AC19561EB200482F21 /* AQChartViewController.h */, + 9BAF61AD19561EB200482F21 /* AQChartViewController.m */, + ); + path = Charts; + sourceTree = ""; + }; + 9BAF61B219561EDF00482F21 /* Base */ = { + isa = PBXGroup; + children = ( + 9BAF61B319561EDF00482F21 /* AQBaseNavigationController.h */, + 9BAF61B419561EDF00482F21 /* AQBaseNavigationController.m */, + ); + path = Base; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 9B769B561946C4EF00581A07 /* anscombe-quartet-ios */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9B769B891946C4EF00581A07 /* Build configuration list for PBXNativeTarget "anscombe-quartet-ios" */; + buildPhases = ( + C076F2AF83A64C7CB7814868 /* Check Pods Manifest.lock */, + 9B769B531946C4EF00581A07 /* Sources */, + 9B769B541946C4EF00581A07 /* Frameworks */, + 9B769B551946C4EF00581A07 /* Resources */, + 132959D29A9747A790B633FF /* Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "anscombe-quartet-ios"; + productName = "anscombe-quartet-ios"; + productReference = 9B769B571946C4EF00581A07 /* anscombe-quartet-ios.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 9B769B4F1946C4EF00581A07 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + ORGANIZATIONNAME = Jawbone; + }; + buildConfigurationList = 9B769B521946C4EF00581A07 /* Build configuration list for PBXProject "anscombe-quartet-ios" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 9B769B4E1946C4EF00581A07; + productRefGroup = 9B769B581946C4EF00581A07 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 9B769B561946C4EF00581A07 /* anscombe-quartet-ios */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 9B769B551946C4EF00581A07 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9B769B731946C4EF00581A07 /* Images.xcassets in Resources */, + 9B769B651946C4EF00581A07 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 132959D29A9747A790B633FF /* Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + C076F2AF83A64C7CB7814868 /* Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 9B769B531946C4EF00581A07 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9BAF61B519561EDF00482F21 /* AQBaseNavigationController.m in Sources */, + 9B9881871946CF3B009304E2 /* AppDelegate.m in Sources */, + 9BAF61AE19561EB200482F21 /* AQChartViewController.m in Sources */, + 9B769B671946C4EF00581A07 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 9B769B631946C4EF00581A07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 9B769B641946C4EF00581A07 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 9B769B871946C4EF00581A07 /* Debug */ = { + isa = XCBuildConfiguration; + 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_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + 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_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 9B769B881946C4EF00581A07 /* Release */ = { + isa = XCBuildConfiguration; + 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_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 9B769B8A1946C4EF00581A07 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 384ED5DE99B94CB1837CF580 /* Pods.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "anscombe-quartet-ios/anscombe-quartet-ios-Prefix.pch"; + INFOPLIST_FILE = "anscombe-quartet-ios/anscombe-quartet-ios-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 9B769B8B1946C4EF00581A07 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 384ED5DE99B94CB1837CF580 /* Pods.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "anscombe-quartet-ios/anscombe-quartet-ios-Prefix.pch"; + INFOPLIST_FILE = "anscombe-quartet-ios/anscombe-quartet-ios-Info.plist"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 9B769B521946C4EF00581A07 /* Build configuration list for PBXProject "anscombe-quartet-ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9B769B871946C4EF00581A07 /* Debug */, + 9B769B881946C4EF00581A07 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9B769B891946C4EF00581A07 /* Build configuration list for PBXNativeTarget "anscombe-quartet-ios" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9B769B8A1946C4EF00581A07 /* Debug */, + 9B769B8B1946C4EF00581A07 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 9B769B4F1946C4EF00581A07 /* Project object */; +} diff --git a/anscombe-quartet-ios/Controllers/AQChartViewController.m b/anscombe-quartet-ios/Controllers/AQChartViewController.m deleted file mode 100644 index 2828270..0000000 --- a/anscombe-quartet-ios/Controllers/AQChartViewController.m +++ /dev/null @@ -1,165 +0,0 @@ -// -// AQChartViewController.m -// anscombe-quartet-ios -// -// Created by Terry Worona on 6/9/14. -// Copyright (c) 2014 Jawbone. All rights reserved. -// - -#import "AQChartViewController.h" - -// Views -#import - -// Enums -typedef NS_ENUM(NSInteger, AQChartScrollViewChartType){ - AQChartScrollViewChartType1, - AQChartScrollViewChartType2, - AQChartScrollViewChartType3, - AQChartScrollViewChartType4, - AQChartScrollViewChartTypeCount -}; - -// Numerics -static const CGFloat kAQChartScrollViewHeight = 200.0f; -static const CGFloat kAQChartScrollViewPageControlHeight = 44.0f; - -@protocol AQScrollViewDataSource; -@protocol AQScrollViewDelegate; - -@interface AQChartScrollView : UIView - -@property (nonatomic, strong) UIScrollView *scrollView; -@property (nonatomic, strong) UIPageControl *pageControl; -@property (nonatomic, weak) id dataSource; -@property (nonatomic, weak) id delegate; - -- (void)reloadData; - -@end - -@protocol AQScrollViewDataSource - -- (NSUInteger)numberOfChartsInChartScrollView:(AQChartScrollView *)chartScrollView; - -@end - -@protocol AQScrollViewDelegate - -- (UIView *)chartScrollView:(AQChartScrollView *)chartScrollView chartViewAtIndex:(NSUInteger)index; - -@end - -@interface AQChartViewController () - -@property (nonatomic, strong) AQChartScrollView *scrollView; -@property (nonatomic, strong) NSArray *chartViews; -@property (nonatomic, strong) NSDictionary *dataModel; - -- (void)initDataModel; - -@end - -@implementation AQChartViewController - -#pragma mark - Alloc/Init - -- (id)init -{ - self = [super init]; - if (self) - { - [self initDataModel]; - } - return self; -} - -#pragma mark - Data - -- (void)initDataModel -{ - NSMutableDictionary *mutableDataModel = [NSMutableDictionary dictionary]; - self.dataModel = [NSMutableDictionary dictionaryWithDictionary:mutableDataModel]; -} - -#pragma mark - View Lifecycle - -- (void)loadView -{ - [super loadView]; - - NSMutableArray *mutableChartViews = [[NSMutableArray alloc] init]; - for (int index=0; index < AQChartScrollViewChartTypeCount; index++) - { - JBLineChartView *lineChartView = [[JBLineChartView alloc] init]; - lineChartView.tag = index; - lineChartView.delegate = self; - lineChartView.dataSource = self; - [mutableChartViews addObject:lineChartView]; - } - self.chartViews = [NSArray arrayWithArray:mutableChartViews]; - - self.scrollView = [[AQChartScrollView alloc] initWithFrame:CGRectMake(self.view.bounds.origin.x, self.view.bounds.origin.y, self.view.bounds.size.width, kAQChartScrollViewHeight)]; - self.scrollView.dataSource = self; - self.scrollView.delegate = self; - [self.scrollView reloadData]; - [self.tableView setTableHeaderView:self.scrollView]; -} - -#pragma mark - AQScrollViewDataSource - -- (NSUInteger)numberOfChartsInChartScrollView:(AQChartScrollView *)chartScrollView -{ - return AQChartScrollViewChartTypeCount; -} - -- (UIView *)chartScrollView:(AQChartScrollView *)chartScrollView chartViewAtIndex:(NSUInteger)index -{ - return nil; -} - -#pragma mark - JBLineChartViewDataSource - -- (NSUInteger)numberOfLinesInLineChartView:(JBLineChartView *)lineChartView; -{ - return 0; -} - -- (NSUInteger)lineChartView:(JBLineChartView *)lineChartView numberOfVerticalValuesAtLineIndex:(NSUInteger)lineIndex -{ - return 0; -} - -#pragma mark - JBLineChartViewDelegate - -- (CGFloat)lineChartView:(JBLineChartView *)lineChartView verticalValueForHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex -{ - return 0; -} - -@end - -@implementation AQChartScrollView - -#pragma mark - Alloc/Init - -- (id)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) - { - _scrollView = [[UIScrollView alloc] initWithFrame:self.bounds]; - [self addSubview:_scrollView]; - - _pageControl = [[UIPageControl alloc] initWithFrame:CGRectMake(self.bounds.origin.x, self.bounds.size.height - kAQChartScrollViewPageControlHeight, self.bounds.size.width, kAQChartScrollViewPageControlHeight)]; - [self addSubview:_pageControl]; - } - return self; -} - -- (void)reloadData -{ - -} - -@end diff --git a/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.h b/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.h new file mode 100644 index 0000000..8548036 --- /dev/null +++ b/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.h @@ -0,0 +1,13 @@ +// +// AQBaseNavigationController.h +// anscombe-quartet-ios +// +// Created by Terry Worona on 6/21/14. +// Copyright (c) 2014 Jawbone. All rights reserved. +// + +#import + +@interface AQBaseNavigationController : UINavigationController + +@end diff --git a/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.m b/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.m new file mode 100644 index 0000000..9274d29 --- /dev/null +++ b/anscombe-quartet-ios/Controllers/Base/AQBaseNavigationController.m @@ -0,0 +1,33 @@ +// +// AQBaseNavigationController.m +// anscombe-quartet-ios +// +// Created by Terry Worona on 6/21/14. +// Copyright (c) 2014 Jawbone. All rights reserved. +// + +#import "AQBaseNavigationController.h" + +@interface AQBaseNavigationController () + +@end + +@implementation AQBaseNavigationController + +- (BOOL)shouldAutorotate +{ + return self.topViewController.shouldAutorotate; +} + +- (NSUInteger)supportedInterfaceOrientations +{ + return UIInterfaceOrientationMaskAllButUpsideDown; +} + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation +{ + return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown); +} + + +@end diff --git a/anscombe-quartet-ios/Controllers/AQChartViewController.h b/anscombe-quartet-ios/Controllers/Charts/AQChartViewController.h similarity index 100% rename from anscombe-quartet-ios/Controllers/AQChartViewController.h rename to anscombe-quartet-ios/Controllers/Charts/AQChartViewController.h diff --git a/anscombe-quartet-ios/Controllers/Charts/AQChartViewController.m b/anscombe-quartet-ios/Controllers/Charts/AQChartViewController.m new file mode 100644 index 0000000..8e3f85f --- /dev/null +++ b/anscombe-quartet-ios/Controllers/Charts/AQChartViewController.m @@ -0,0 +1,191 @@ +// +// AQChartViewController.m +// anscombe-quartet-ios +// +// Created by Terry Worona on 6/9/14. +// Copyright (c) 2014 Jawbone. All rights reserved. +// + +#import "AQChartViewController.h" + +// Views +#import + +// Enums +typedef NS_ENUM(NSInteger, AQChartViewChartType){ + AQChartViewChartType1, + AQChartViewChartType2, + AQChartViewChartType3, + AQChartViewChartType4, + AQChartViewChartTypeCount +}; + +// Numerics (JBLineChartLineView) +CGFloat static const kAQChartGridViewPadding = 10.0f; + +@interface AQChartView : JBLineChartView + +@end + +@interface AQChartGridView : UIView + +@property (nonatomic, strong) NSArray *chartViews; + +- (void)reloadData; + +@end + +@interface AQChartViewController () + +@property (nonatomic, strong) AQChartGridView *chartGridView; +@property (nonatomic, strong) NSDictionary *dataModel; + +- (void)initDataModel; + +@end + +@implementation AQChartViewController + +#pragma mark - Alloc/Init + +- (id)init +{ + self = [super init]; + if (self) + { + [self initDataModel]; + } + return self; +} + +#pragma mark - Data + +- (void)initDataModel +{ + NSMutableDictionary *mutableDataModel = [NSMutableDictionary dictionary]; + self.dataModel = [NSMutableDictionary dictionaryWithDictionary:mutableDataModel]; +} + +#pragma mark - View Lifecycle + +- (void)loadView +{ + [super loadView]; + + self.edgesForExtendedLayout = UIRectEdgeNone; + + self.chartGridView = [[AQChartGridView alloc] initWithFrame:self.view.bounds]; + self.chartGridView.backgroundColor = [UIColor purpleColor]; + self.view = self.chartGridView; + + NSMutableArray *mutableChartGrids = [[NSMutableArray alloc] init]; + for (int chartIndex=0; chartIndex 0) + { + // Layout assumes max 4 charts + NSAssert([self.chartViews count] == 4, @"AQChartGridView // layout supports exactly 4 charts."); + + CGFloat chartWidth = ceil((self.bounds.size.width - (kAQChartGridViewPadding * 3)) * 0.5f); + CGFloat chartHeight = ceil((self.bounds.size.height - (kAQChartGridViewPadding * 3)) * 0.5f); + + CGFloat xOffset = kAQChartGridViewPadding; + CGFloat yOffset = kAQChartGridViewPadding; + + for (AQChartView *chartView in self.chartViews) + { + chartView.frame = CGRectMake(xOffset, yOffset, chartWidth, chartHeight); + + if (chartView.tag == AQChartViewChartType2) + { + yOffset += chartHeight + kAQChartGridViewPadding; + xOffset = kAQChartGridViewPadding; + } + else + { + xOffset += chartWidth + kAQChartGridViewPadding; + } + } + } +} + +#pragma mark - Setters + +- (void)setChartViews:(NSArray *)chartViews +{ + for (AQChartView *oldChartView in self.chartViews) + { + [oldChartView removeFromSuperview]; + } + + for (AQChartView *newChartView in chartViews) + { + [self addSubview:newChartView]; + } + + _chartViews = chartViews; + + [self setNeedsLayout]; +} + +@end \ No newline at end of file diff --git a/anscombe-quartet-ios/Delegate/AppDelegate.m b/anscombe-quartet-ios/Delegate/AppDelegate.m index 43a19f3..af3a66f 100644 --- a/anscombe-quartet-ios/Delegate/AppDelegate.m +++ b/anscombe-quartet-ios/Delegate/AppDelegate.m @@ -10,13 +10,14 @@ // Controllers #import "AQChartViewController.h" +#import "AQBaseNavigationController.h" @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:[[AQChartViewController alloc] init]]; + AQBaseNavigationController *navigationController = [[AQBaseNavigationController alloc] initWithRootViewController:[[AQChartViewController alloc] init]]; self.window.rootViewController = navigationController; [self.window makeKeyAndVisible]; return YES;