diff --git a/PartTwo/PartTwo.xcodeproj/project.pbxproj b/PartTwo/PartTwo.xcodeproj/project.pbxproj index 5582517..eba6ab8 100644 --- a/PartTwo/PartTwo.xcodeproj/project.pbxproj +++ b/PartTwo/PartTwo.xcodeproj/project.pbxproj @@ -7,68 +7,54 @@ objects = { /* Begin PBXBuildFile section */ - 8DD103491BA66E0900CE483B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DD103481BA66E0900CE483B /* main.m */; }; - 8DD1034C1BA66E0900CE483B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DD1034B1BA66E0900CE483B /* AppDelegate.m */; }; - 8DD1034F1BA66E0900CE483B /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DD1034E1BA66E0900CE483B /* ViewController.m */; }; - 8DD103521BA66E0900CE483B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DD103501BA66E0900CE483B /* Main.storyboard */; }; - 8DD103541BA66E0900CE483B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DD103531BA66E0900CE483B /* Assets.xcassets */; }; - 8DD103571BA66E0900CE483B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DD103551BA66E0900CE483B /* LaunchScreen.storyboard */; }; - 8DD103621BA66E0900CE483B /* PartTwoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DD103611BA66E0900CE483B /* PartTwoTests.m */; }; - 8DD1036D1BA66E0900CE483B /* PartTwoUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DD1036C1BA66E0900CE483B /* PartTwoUITests.m */; }; + 384095891BAC8947000CF3C0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 384095881BAC8947000CF3C0 /* main.m */; }; + 3840958C1BAC8947000CF3C0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3840958B1BAC8947000CF3C0 /* AppDelegate.m */; }; + 3840958F1BAC8947000CF3C0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3840958E1BAC8947000CF3C0 /* ViewController.m */; }; + 384095921BAC8948000CF3C0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 384095901BAC8948000CF3C0 /* Main.storyboard */; }; + 384095941BAC8948000CF3C0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 384095931BAC8948000CF3C0 /* Images.xcassets */; }; + 384095971BAC8948000CF3C0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 384095951BAC8948000CF3C0 /* LaunchScreen.xib */; }; + 384095A31BAC8948000CF3C0 /* PartTwoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 384095A21BAC8948000CF3C0 /* PartTwoTests.m */; }; + 384095AF1BAC918F000CF3C0 /* socialView.m in Sources */ = {isa = PBXBuildFile; fileRef = 384095AE1BAC918F000CF3C0 /* socialView.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 8DD1035E1BA66E0900CE483B /* PBXContainerItemProxy */ = { + 3840959D1BAC8948000CF3C0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 8DD1033C1BA66E0900CE483B /* Project object */; + containerPortal = 3840957B1BAC8944000CF3C0 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8DD103431BA66E0900CE483B; - remoteInfo = PartTwo; - }; - 8DD103691BA66E0900CE483B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8DD1033C1BA66E0900CE483B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8DD103431BA66E0900CE483B; + remoteGlobalIDString = 384095821BAC8946000CF3C0; remoteInfo = PartTwo; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8DD103441BA66E0900CE483B /* PartTwo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PartTwo.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8DD103481BA66E0900CE483B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 8DD1034A1BA66E0900CE483B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 8DD1034B1BA66E0900CE483B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8DD1034D1BA66E0900CE483B /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8DD1034E1BA66E0900CE483B /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 8DD103511BA66E0900CE483B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 8DD103531BA66E0900CE483B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 8DD103561BA66E0900CE483B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 8DD103581BA66E0900CE483B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DD1035D1BA66E0900CE483B /* PartTwoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PartTwoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8DD103611BA66E0900CE483B /* PartTwoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartTwoTests.m; sourceTree = ""; }; - 8DD103631BA66E0900CE483B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DD103681BA66E0900CE483B /* PartTwoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PartTwoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8DD1036C1BA66E0900CE483B /* PartTwoUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartTwoUITests.m; sourceTree = ""; }; - 8DD1036E1BA66E0900CE483B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 384095831BAC8946000CF3C0 /* PartTwo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PartTwo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 384095871BAC8947000CF3C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 384095881BAC8947000CF3C0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 3840958A1BAC8947000CF3C0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 3840958B1BAC8947000CF3C0 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 3840958D1BAC8947000CF3C0 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 3840958E1BAC8947000CF3C0 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 384095911BAC8948000CF3C0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 384095931BAC8948000CF3C0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 384095961BAC8948000CF3C0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 3840959C1BAC8948000CF3C0 /* PartTwoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PartTwoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 384095A11BAC8948000CF3C0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 384095A21BAC8948000CF3C0 /* PartTwoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PartTwoTests.m; sourceTree = ""; }; + 384095AC1BAC8F88000CF3C0 /* socialProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socialProtocol.h; sourceTree = ""; }; + 384095AD1BAC918F000CF3C0 /* socialView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socialView.h; sourceTree = ""; }; + 384095AE1BAC918F000CF3C0 /* socialView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = socialView.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 8DD103411BA66E0900CE483B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8DD1035A1BA66E0900CE483B /* Frameworks */ = { + 384095801BAC8946000CF3C0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 8DD103651BA66E0900CE483B /* Frameworks */ = { + 384095991BAC8948000CF3C0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -78,78 +64,78 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 8DD1033B1BA66E0900CE483B = { + 3840957A1BAC8944000CF3C0 = { isa = PBXGroup; children = ( - 8DD103461BA66E0900CE483B /* PartTwo */, - 8DD103601BA66E0900CE483B /* PartTwoTests */, - 8DD1036B1BA66E0900CE483B /* PartTwoUITests */, - 8DD103451BA66E0900CE483B /* Products */, + 384095851BAC8946000CF3C0 /* PartTwo */, + 3840959F1BAC8948000CF3C0 /* PartTwoTests */, + 384095841BAC8946000CF3C0 /* Products */, ); sourceTree = ""; }; - 8DD103451BA66E0900CE483B /* Products */ = { + 384095841BAC8946000CF3C0 /* Products */ = { isa = PBXGroup; children = ( - 8DD103441BA66E0900CE483B /* PartTwo.app */, - 8DD1035D1BA66E0900CE483B /* PartTwoTests.xctest */, - 8DD103681BA66E0900CE483B /* PartTwoUITests.xctest */, + 384095831BAC8946000CF3C0 /* PartTwo.app */, + 3840959C1BAC8948000CF3C0 /* PartTwoTests.xctest */, ); name = Products; sourceTree = ""; }; - 8DD103461BA66E0900CE483B /* PartTwo */ = { + 384095851BAC8946000CF3C0 /* PartTwo */ = { isa = PBXGroup; children = ( - 8DD1034A1BA66E0900CE483B /* AppDelegate.h */, - 8DD1034B1BA66E0900CE483B /* AppDelegate.m */, - 8DD1034D1BA66E0900CE483B /* ViewController.h */, - 8DD1034E1BA66E0900CE483B /* ViewController.m */, - 8DD103501BA66E0900CE483B /* Main.storyboard */, - 8DD103531BA66E0900CE483B /* Assets.xcassets */, - 8DD103551BA66E0900CE483B /* LaunchScreen.storyboard */, - 8DD103581BA66E0900CE483B /* Info.plist */, - 8DD103471BA66E0900CE483B /* Supporting Files */, + 3840958A1BAC8947000CF3C0 /* AppDelegate.h */, + 3840958B1BAC8947000CF3C0 /* AppDelegate.m */, + 3840958D1BAC8947000CF3C0 /* ViewController.h */, + 384095AD1BAC918F000CF3C0 /* socialView.h */, + 384095AE1BAC918F000CF3C0 /* socialView.m */, + 3840958E1BAC8947000CF3C0 /* ViewController.m */, + 384095901BAC8948000CF3C0 /* Main.storyboard */, + 384095AC1BAC8F88000CF3C0 /* socialProtocol.h */, + 384095931BAC8948000CF3C0 /* Images.xcassets */, + 384095951BAC8948000CF3C0 /* LaunchScreen.xib */, + 384095861BAC8947000CF3C0 /* Supporting Files */, ); path = PartTwo; sourceTree = ""; }; - 8DD103471BA66E0900CE483B /* Supporting Files */ = { + 384095861BAC8947000CF3C0 /* Supporting Files */ = { isa = PBXGroup; children = ( - 8DD103481BA66E0900CE483B /* main.m */, + 384095871BAC8947000CF3C0 /* Info.plist */, + 384095881BAC8947000CF3C0 /* main.m */, ); name = "Supporting Files"; sourceTree = ""; }; - 8DD103601BA66E0900CE483B /* PartTwoTests */ = { + 3840959F1BAC8948000CF3C0 /* PartTwoTests */ = { isa = PBXGroup; children = ( - 8DD103611BA66E0900CE483B /* PartTwoTests.m */, - 8DD103631BA66E0900CE483B /* Info.plist */, + 384095A21BAC8948000CF3C0 /* PartTwoTests.m */, + 384095A01BAC8948000CF3C0 /* Supporting Files */, ); path = PartTwoTests; sourceTree = ""; }; - 8DD1036B1BA66E0900CE483B /* PartTwoUITests */ = { + 384095A01BAC8948000CF3C0 /* Supporting Files */ = { isa = PBXGroup; children = ( - 8DD1036C1BA66E0900CE483B /* PartTwoUITests.m */, - 8DD1036E1BA66E0900CE483B /* Info.plist */, + 384095A11BAC8948000CF3C0 /* Info.plist */, ); - path = PartTwoUITests; + name = "Supporting Files"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8DD103431BA66E0900CE483B /* PartTwo */ = { + 384095821BAC8946000CF3C0 /* PartTwo */ = { isa = PBXNativeTarget; - buildConfigurationList = 8DD103711BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwo" */; + buildConfigurationList = 384095A61BAC8948000CF3C0 /* Build configuration list for PBXNativeTarget "PartTwo" */; buildPhases = ( - 8DD103401BA66E0900CE483B /* Sources */, - 8DD103411BA66E0900CE483B /* Frameworks */, - 8DD103421BA66E0900CE483B /* Resources */, + 3840957F1BAC8946000CF3C0 /* Sources */, + 384095801BAC8946000CF3C0 /* Frameworks */, + 384095811BAC8946000CF3C0 /* Resources */, ); buildRules = ( ); @@ -157,68 +143,46 @@ ); name = PartTwo; productName = PartTwo; - productReference = 8DD103441BA66E0900CE483B /* PartTwo.app */; + productReference = 384095831BAC8946000CF3C0 /* PartTwo.app */; productType = "com.apple.product-type.application"; }; - 8DD1035C1BA66E0900CE483B /* PartTwoTests */ = { + 3840959B1BAC8948000CF3C0 /* PartTwoTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 8DD103741BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwoTests" */; + buildConfigurationList = 384095A91BAC8948000CF3C0 /* Build configuration list for PBXNativeTarget "PartTwoTests" */; buildPhases = ( - 8DD103591BA66E0900CE483B /* Sources */, - 8DD1035A1BA66E0900CE483B /* Frameworks */, - 8DD1035B1BA66E0900CE483B /* Resources */, + 384095981BAC8948000CF3C0 /* Sources */, + 384095991BAC8948000CF3C0 /* Frameworks */, + 3840959A1BAC8948000CF3C0 /* Resources */, ); buildRules = ( ); dependencies = ( - 8DD1035F1BA66E0900CE483B /* PBXTargetDependency */, + 3840959E1BAC8948000CF3C0 /* PBXTargetDependency */, ); name = PartTwoTests; productName = PartTwoTests; - productReference = 8DD1035D1BA66E0900CE483B /* PartTwoTests.xctest */; + productReference = 3840959C1BAC8948000CF3C0 /* PartTwoTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 8DD103671BA66E0900CE483B /* PartTwoUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8DD103771BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwoUITests" */; - buildPhases = ( - 8DD103641BA66E0900CE483B /* Sources */, - 8DD103651BA66E0900CE483B /* Frameworks */, - 8DD103661BA66E0900CE483B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 8DD1036A1BA66E0900CE483B /* PBXTargetDependency */, - ); - name = PartTwoUITests; - productName = PartTwoUITests; - productReference = 8DD103681BA66E0900CE483B /* PartTwoUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 8DD1033C1BA66E0900CE483B /* Project object */ = { + 3840957B1BAC8944000CF3C0 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Mike Kavouras"; + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = Henna; TargetAttributes = { - 8DD103431BA66E0900CE483B = { - CreatedOnToolsVersion = 7.0; - }; - 8DD1035C1BA66E0900CE483B = { - CreatedOnToolsVersion = 7.0; - TestTargetID = 8DD103431BA66E0900CE483B; + 384095821BAC8946000CF3C0 = { + CreatedOnToolsVersion = 6.4; }; - 8DD103671BA66E0900CE483B = { - CreatedOnToolsVersion = 7.0; - TestTargetID = 8DD103431BA66E0900CE483B; + 3840959B1BAC8948000CF3C0 = { + CreatedOnToolsVersion = 6.4; + TestTargetID = 384095821BAC8946000CF3C0; }; }; }; - buildConfigurationList = 8DD1033F1BA66E0900CE483B /* Build configuration list for PBXProject "PartTwo" */; + buildConfigurationList = 3840957E1BAC8944000CF3C0 /* Build configuration list for PBXProject "PartTwo" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -226,37 +190,29 @@ en, Base, ); - mainGroup = 8DD1033B1BA66E0900CE483B; - productRefGroup = 8DD103451BA66E0900CE483B /* Products */; + mainGroup = 3840957A1BAC8944000CF3C0; + productRefGroup = 384095841BAC8946000CF3C0 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 8DD103431BA66E0900CE483B /* PartTwo */, - 8DD1035C1BA66E0900CE483B /* PartTwoTests */, - 8DD103671BA66E0900CE483B /* PartTwoUITests */, + 384095821BAC8946000CF3C0 /* PartTwo */, + 3840959B1BAC8948000CF3C0 /* PartTwoTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 8DD103421BA66E0900CE483B /* Resources */ = { + 384095811BAC8946000CF3C0 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8DD103571BA66E0900CE483B /* LaunchScreen.storyboard in Resources */, - 8DD103541BA66E0900CE483B /* Assets.xcassets in Resources */, - 8DD103521BA66E0900CE483B /* Main.storyboard in Resources */, + 384095921BAC8948000CF3C0 /* Main.storyboard in Resources */, + 384095971BAC8948000CF3C0 /* LaunchScreen.xib in Resources */, + 384095941BAC8948000CF3C0 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 8DD1035B1BA66E0900CE483B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8DD103661BA66E0900CE483B /* Resources */ = { + 3840959A1BAC8948000CF3C0 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -266,68 +222,56 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 8DD103401BA66E0900CE483B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8DD1034F1BA66E0900CE483B /* ViewController.m in Sources */, - 8DD1034C1BA66E0900CE483B /* AppDelegate.m in Sources */, - 8DD103491BA66E0900CE483B /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8DD103591BA66E0900CE483B /* Sources */ = { + 3840957F1BAC8946000CF3C0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8DD103621BA66E0900CE483B /* PartTwoTests.m in Sources */, + 3840958F1BAC8947000CF3C0 /* ViewController.m in Sources */, + 384095AF1BAC918F000CF3C0 /* socialView.m in Sources */, + 3840958C1BAC8947000CF3C0 /* AppDelegate.m in Sources */, + 384095891BAC8947000CF3C0 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 8DD103641BA66E0900CE483B /* Sources */ = { + 384095981BAC8948000CF3C0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8DD1036D1BA66E0900CE483B /* PartTwoUITests.m in Sources */, + 384095A31BAC8948000CF3C0 /* PartTwoTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 8DD1035F1BA66E0900CE483B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8DD103431BA66E0900CE483B /* PartTwo */; - targetProxy = 8DD1035E1BA66E0900CE483B /* PBXContainerItemProxy */; - }; - 8DD1036A1BA66E0900CE483B /* PBXTargetDependency */ = { + 3840959E1BAC8948000CF3C0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 8DD103431BA66E0900CE483B /* PartTwo */; - targetProxy = 8DD103691BA66E0900CE483B /* PBXContainerItemProxy */; + target = 384095821BAC8946000CF3C0 /* PartTwo */; + targetProxy = 3840959D1BAC8948000CF3C0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 8DD103501BA66E0900CE483B /* Main.storyboard */ = { + 384095901BAC8948000CF3C0 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 8DD103511BA66E0900CE483B /* Base */, + 384095911BAC8948000CF3C0 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 8DD103551BA66E0900CE483B /* LaunchScreen.storyboard */ = { + 384095951BAC8948000CF3C0 /* LaunchScreen.xib */ = { isa = PBXVariantGroup; children = ( - 8DD103561BA66E0900CE483B /* Base */, + 384095961BAC8948000CF3C0 /* Base */, ); - name = LaunchScreen.storyboard; + name = LaunchScreen.xib; sourceTree = ""; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 8DD1036F1BA66E0900CE483B /* Debug */ = { + 384095A41BAC8948000CF3C0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -346,9 +290,8 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -357,20 +300,21 @@ "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 = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; }; - 8DD103701BA66E0900CE483B /* Release */ = { + 384095A51BAC8948000CF3C0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -400,122 +344,96 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; }; - 8DD103721BA66E0900CE483B /* Debug */ = { + 384095A71BAC8948000CF3C0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = PartTwo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwo; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; - 8DD103731BA66E0900CE483B /* Release */ = { + 384095A81BAC8948000CF3C0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = PartTwo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwo; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; - 8DD103751BA66E0900CE483B /* Debug */ = { + 384095AA1BAC8948000CF3C0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); INFOPLIST_FILE = PartTwoTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwoTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PartTwo.app/PartTwo"; }; name = Debug; }; - 8DD103761BA66E0900CE483B /* Release */ = { + 384095AB1BAC8948000CF3C0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); INFOPLIST_FILE = PartTwoTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwoTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PartTwo.app/PartTwo"; }; name = Release; }; - 8DD103781BA66E0900CE483B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PartTwoUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwoUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = PartTwo; - USES_XCTRUNNER = YES; - }; - name = Debug; - }; - 8DD103791BA66E0900CE483B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PartTwoUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PartTwoUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = PartTwo; - USES_XCTRUNNER = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 8DD1033F1BA66E0900CE483B /* Build configuration list for PBXProject "PartTwo" */ = { + 3840957E1BAC8944000CF3C0 /* Build configuration list for PBXProject "PartTwo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8DD1036F1BA66E0900CE483B /* Debug */, - 8DD103701BA66E0900CE483B /* Release */, + 384095A41BAC8948000CF3C0 /* Debug */, + 384095A51BAC8948000CF3C0 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8DD103711BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8DD103721BA66E0900CE483B /* Debug */, - 8DD103731BA66E0900CE483B /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; - 8DD103741BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwoTests" */ = { + 384095A61BAC8948000CF3C0 /* Build configuration list for PBXNativeTarget "PartTwo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8DD103751BA66E0900CE483B /* Debug */, - 8DD103761BA66E0900CE483B /* Release */, + 384095A71BAC8948000CF3C0 /* Debug */, + 384095A81BAC8948000CF3C0 /* Release */, ); defaultConfigurationIsVisible = 0; }; - 8DD103771BA66E0900CE483B /* Build configuration list for PBXNativeTarget "PartTwoUITests" */ = { + 384095A91BAC8948000CF3C0 /* Build configuration list for PBXNativeTarget "PartTwoTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8DD103781BA66E0900CE483B /* Debug */, - 8DD103791BA66E0900CE483B /* Release */, + 384095AA1BAC8948000CF3C0 /* Debug */, + 384095AB1BAC8948000CF3C0 /* Release */, ); defaultConfigurationIsVisible = 0; }; /* End XCConfigurationList section */ }; - rootObject = 8DD1033C1BA66E0900CE483B /* Project object */; + rootObject = 3840957B1BAC8944000CF3C0 /* Project object */; } diff --git a/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcshareddata/PartTwo.xccheckout b/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcshareddata/PartTwo.xccheckout new file mode 100644 index 0000000..17ed66d --- /dev/null +++ b/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcshareddata/PartTwo.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + BD4FF3B7-19B4-414B-A0B0-F58B1D1DEA21 + IDESourceControlProjectName + PartTwo + IDESourceControlProjectOriginsDictionary + + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + https://github.com/xhenna92/unit-2-hw-0.git + + IDESourceControlProjectPath + PartTwo/PartTwo.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + ../../.. + + IDESourceControlProjectURL + https://github.com/xhenna92/unit-2-hw-0.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + IDESourceControlWCCName + unit-2-hw-0 + + + + diff --git a/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate b/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..ad055e6 Binary files /dev/null and b/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate b/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 3c93f2f..0000000 Binary files a/PartTwo/PartTwo.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..fe2b454 --- /dev/null +++ b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PartTwo.xcscheme b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PartTwo.xcscheme similarity index 80% rename from PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PartTwo.xcscheme rename to PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PartTwo.xcscheme index 7b83b68..f9ca356 100644 --- a/PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PartTwo.xcscheme +++ b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PartTwo.xcscheme @@ -1,6 +1,6 @@ + + + + + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> - - - - - - @@ -85,16 +86,16 @@ diff --git a/PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 74% rename from PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist rename to PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist index 8d9c097..b5569fa 100644 --- a/PartTwo/PartTwo.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/PartTwo/PartTwo.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,17 +12,12 @@ SuppressBuildableAutocreation - 8DD103431BA66E0900CE483B + 384095821BAC8946000CF3C0 primary - 8DD1035C1BA66E0900CE483B - - primary - - - 8DD103671BA66E0900CE483B + 3840959B1BAC8948000CF3C0 primary diff --git a/PartTwo/PartTwo/AppDelegate.h b/PartTwo/PartTwo/AppDelegate.h index 4528ec4..e7a4188 100644 --- a/PartTwo/PartTwo/AppDelegate.h +++ b/PartTwo/PartTwo/AppDelegate.h @@ -2,8 +2,8 @@ // AppDelegate.h // PartTwo // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PartTwo/PartTwo/AppDelegate.m b/PartTwo/PartTwo/AppDelegate.m index ec03d17..2db8d04 100644 --- a/PartTwo/PartTwo/AppDelegate.m +++ b/PartTwo/PartTwo/AppDelegate.m @@ -2,8 +2,8 @@ // AppDelegate.m // PartTwo // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import "AppDelegate.h" diff --git a/PartTwo/PartTwo/Base.lproj/LaunchScreen.storyboard b/PartTwo/PartTwo/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 2e721e1..0000000 --- a/PartTwo/PartTwo/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PartTwo/PartTwo/Base.lproj/LaunchScreen.xib b/PartTwo/PartTwo/Base.lproj/LaunchScreen.xib new file mode 100644 index 0000000..049aa41 --- /dev/null +++ b/PartTwo/PartTwo/Base.lproj/LaunchScreen.xib @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PartTwo/PartTwo/Base.lproj/Main.storyboard b/PartTwo/PartTwo/Base.lproj/Main.storyboard index f56d2f3..815d7c7 100644 --- a/PartTwo/PartTwo/Base.lproj/Main.storyboard +++ b/PartTwo/PartTwo/Base.lproj/Main.storyboard @@ -1,24 +1,86 @@ - + - + + - + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/PartTwo/PartTwo/Assets.xcassets/AppIcon.appiconset/Contents.json b/PartTwo/PartTwo/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PartTwo/PartTwo/Assets.xcassets/AppIcon.appiconset/Contents.json rename to PartTwo/PartTwo/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/PartTwo/PartTwo/Info.plist b/PartTwo/PartTwo/Info.plist index 6905cc6..3a7483e 100644 --- a/PartTwo/PartTwo/Info.plist +++ b/PartTwo/PartTwo/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + nyc.c4q.xhenna92.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/PartTwo/PartTwo/ViewController.h b/PartTwo/PartTwo/ViewController.h index cb5d98b..7530ebf 100644 --- a/PartTwo/PartTwo/ViewController.h +++ b/PartTwo/PartTwo/ViewController.h @@ -2,8 +2,8 @@ // ViewController.h // PartTwo // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PartTwo/PartTwo/ViewController.m b/PartTwo/PartTwo/ViewController.m index adca251..edbdec4 100644 --- a/PartTwo/PartTwo/ViewController.m +++ b/PartTwo/PartTwo/ViewController.m @@ -2,13 +2,17 @@ // ViewController.m // PartTwo // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import "ViewController.h" +#import "socialView.h" +#import "socialProtocol.h" -@interface ViewController () +@interface ViewController () +@property (strong, nonatomic) IBOutlet UIView *background; +@property (weak, nonatomic) IBOutlet socialView *socialMediaView; @end @@ -16,6 +20,10 @@ @implementation ViewController - (void)viewDidLoad { [super viewDidLoad]; + self.socialMediaView.delegate = self; + + + // Do any additional setup after loading the view, typically from a nib. } @@ -24,4 +32,16 @@ - (void)didReceiveMemoryWarning { // Dispose of any resources that can be recreated. } +- (void)didTapLikeButton: (socialView *)view{ + self.background.backgroundColor = [UIColor blueColor]; +} + +- (void)didTapCommentButton: (socialView *)view{ + self.background.backgroundColor = [UIColor greenColor]; +} + +- (void)didTapShareButton:(socialView *)view{ + self.background.backgroundColor = [UIColor redColor]; +} + @end diff --git a/PartTwo/PartTwo/main.m b/PartTwo/PartTwo/main.m index bfba89d..36d3a2c 100644 --- a/PartTwo/PartTwo/main.m +++ b/PartTwo/PartTwo/main.m @@ -2,8 +2,8 @@ // main.m // PartTwo // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PartTwo/PartTwo/socialProtocol.h b/PartTwo/PartTwo/socialProtocol.h new file mode 100644 index 0000000..f5c127a --- /dev/null +++ b/PartTwo/PartTwo/socialProtocol.h @@ -0,0 +1,19 @@ +// +// socialProtocol.h +// PartTwo +// +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. +// + +#import +@class socialView; +@protocol socialProtocol + +- (void)didTapLikeButton:(socialView *)view; + +- (void)didTapCommentButton:(socialView *)view; + +- (void)didTapShareButton:(socialView *)view; + +@end diff --git a/PartTwo/PartTwo/socialView.h b/PartTwo/PartTwo/socialView.h new file mode 100644 index 0000000..e17998e --- /dev/null +++ b/PartTwo/PartTwo/socialView.h @@ -0,0 +1,14 @@ +// +// socialView.h +// PartTwo +// +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. +// + +#import +#import "socialProtocol.h" + +@interface socialView : UIView +@property (nonatomic, weak) id delegate; +@end diff --git a/PartTwo/PartTwo/socialView.m b/PartTwo/PartTwo/socialView.m new file mode 100644 index 0000000..a0794d5 --- /dev/null +++ b/PartTwo/PartTwo/socialView.m @@ -0,0 +1,30 @@ +// +// socialView.m +// PartTwo +// +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. +// + +#import "socialView.h" + + +@implementation socialView + +- (IBAction)likeButtonTapped:(UIButton *)sender { + + [self.delegate didTapLikeButton:self]; +} + +- (IBAction)commentButtonTapped:(UIButton *)sender { + + [self.delegate didTapCommentButton:self]; +} + +- (IBAction)shareButtonTapped:(UIButton *)sender { + + [self.delegate didTapShareButton:self]; +} + + +@end diff --git a/PartTwo/PartTwoTests/Info.plist b/PartTwo/PartTwoTests/Info.plist index ba72822..d03d7a9 100644 --- a/PartTwo/PartTwoTests/Info.plist +++ b/PartTwo/PartTwoTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + nyc.c4q.xhenna92.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/PartTwo/PartTwoTests/PartTwoTests.m b/PartTwo/PartTwoTests/PartTwoTests.m index 2194ef9..fff9da7 100644 --- a/PartTwo/PartTwoTests/PartTwoTests.m +++ b/PartTwo/PartTwoTests/PartTwoTests.m @@ -2,10 +2,11 @@ // PartTwoTests.m // PartTwoTests // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/18/15. +// Copyright (c) 2015 Henna. All rights reserved. // +#import #import @interface PartTwoTests : XCTestCase @@ -26,7 +27,7 @@ - (void)tearDown { - (void)testExample { // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. + XCTAssert(YES, @"Pass"); } - (void)testPerformanceExample { diff --git a/PartTwo/PartTwoUITests/Info.plist b/PartTwo/PartTwoUITests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/PartTwo/PartTwoUITests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/PartTwo/PartTwoUITests/PartTwoUITests.m b/PartTwo/PartTwoUITests/PartTwoUITests.m deleted file mode 100644 index f379cfc..0000000 --- a/PartTwo/PartTwoUITests/PartTwoUITests.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// PartTwoUITests.m -// PartTwoUITests -// -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. -// - -#import - -@interface PartTwoUITests : XCTestCase - -@end - -@implementation PartTwoUITests - -- (void)setUp { - [super setUp]; - - // Put setup code here. This method is called before the invocation of each test method in the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - self.continueAfterFailure = NO; - // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method. - [[[XCUIApplication alloc] init] launch]; - - // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. -} - -@end diff --git a/PickAPic/PickAPic.xcodeproj/project.pbxproj b/PickAPic/PickAPic.xcodeproj/project.pbxproj index 049896b..2f715f7 100644 --- a/PickAPic/PickAPic.xcodeproj/project.pbxproj +++ b/PickAPic/PickAPic.xcodeproj/project.pbxproj @@ -7,68 +7,53 @@ objects = { /* Begin PBXBuildFile section */ - 8D1F73C11BA66AE50040D369 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D1F73C01BA66AE50040D369 /* main.m */; }; - 8D1F73C41BA66AE50040D369 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D1F73C31BA66AE50040D369 /* AppDelegate.m */; }; - 8D1F73C71BA66AE50040D369 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D1F73C61BA66AE50040D369 /* ViewController.m */; }; - 8D1F73CA1BA66AE50040D369 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D1F73C81BA66AE50040D369 /* Main.storyboard */; }; - 8D1F73CC1BA66AE50040D369 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D1F73CB1BA66AE50040D369 /* Assets.xcassets */; }; - 8D1F73CF1BA66AE50040D369 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D1F73CD1BA66AE50040D369 /* LaunchScreen.storyboard */; }; - 8D1F73DA1BA66AE50040D369 /* PickAPicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D1F73D91BA66AE50040D369 /* PickAPicTests.m */; }; - 8D1F73E51BA66AE50040D369 /* PickAPicUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D1F73E41BA66AE50040D369 /* PickAPicUITests.m */; }; + 38FCE1111BA8FC2E00E8F313 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FCE1101BA8FC2E00E8F313 /* main.m */; }; + 38FCE1141BA8FC2E00E8F313 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FCE1131BA8FC2E00E8F313 /* AppDelegate.m */; }; + 38FCE1171BA8FC2E00E8F313 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FCE1161BA8FC2E00E8F313 /* ViewController.m */; }; + 38FCE11A1BA8FC2E00E8F313 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 38FCE1181BA8FC2E00E8F313 /* Main.storyboard */; }; + 38FCE11C1BA8FC2E00E8F313 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 38FCE11B1BA8FC2E00E8F313 /* Images.xcassets */; }; + 38FCE11F1BA8FC2E00E8F313 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38FCE11D1BA8FC2E00E8F313 /* LaunchScreen.xib */; }; + 38FCE12B1BA8FC2F00E8F313 /* PickAPicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FCE12A1BA8FC2F00E8F313 /* PickAPicTests.m */; }; + 38FCE1361BA9020F00E8F313 /* SocialMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FCE1351BA9020F00E8F313 /* SocialMainViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 8D1F73D61BA66AE50040D369 /* PBXContainerItemProxy */ = { + 38FCE1251BA8FC2F00E8F313 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 8D1F73B41BA66AE50040D369 /* Project object */; + containerPortal = 38FCE1031BA8FC2E00E8F313 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8D1F73BB1BA66AE50040D369; - remoteInfo = PickAPic; - }; - 8D1F73E11BA66AE50040D369 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8D1F73B41BA66AE50040D369 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D1F73BB1BA66AE50040D369; + remoteGlobalIDString = 38FCE10A1BA8FC2E00E8F313; remoteInfo = PickAPic; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8D1F73BC1BA66AE50040D369 /* PickAPic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PickAPic.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D1F73C01BA66AE50040D369 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 8D1F73C21BA66AE50040D369 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 8D1F73C31BA66AE50040D369 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8D1F73C51BA66AE50040D369 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8D1F73C61BA66AE50040D369 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 8D1F73C91BA66AE50040D369 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 8D1F73CB1BA66AE50040D369 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 8D1F73CE1BA66AE50040D369 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 8D1F73D01BA66AE50040D369 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8D1F73D51BA66AE50040D369 /* PickAPicTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PickAPicTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D1F73D91BA66AE50040D369 /* PickAPicTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PickAPicTests.m; sourceTree = ""; }; - 8D1F73DB1BA66AE50040D369 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8D1F73E01BA66AE50040D369 /* PickAPicUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PickAPicUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D1F73E41BA66AE50040D369 /* PickAPicUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PickAPicUITests.m; sourceTree = ""; }; - 8D1F73E61BA66AE50040D369 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 38FCE10B1BA8FC2E00E8F313 /* PickAPic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PickAPic.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 38FCE10F1BA8FC2E00E8F313 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 38FCE1101BA8FC2E00E8F313 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 38FCE1121BA8FC2E00E8F313 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 38FCE1131BA8FC2E00E8F313 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 38FCE1151BA8FC2E00E8F313 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 38FCE1161BA8FC2E00E8F313 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 38FCE1191BA8FC2E00E8F313 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 38FCE11B1BA8FC2E00E8F313 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 38FCE11E1BA8FC2E00E8F313 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + 38FCE1241BA8FC2F00E8F313 /* PickAPicTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PickAPicTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 38FCE1291BA8FC2F00E8F313 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 38FCE12A1BA8FC2F00E8F313 /* PickAPicTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PickAPicTests.m; sourceTree = ""; }; + 38FCE1341BA9020F00E8F313 /* SocialMainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocialMainViewController.h; sourceTree = ""; }; + 38FCE1351BA9020F00E8F313 /* SocialMainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocialMainViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 8D1F73B91BA66AE50040D369 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D1F73D21BA66AE50040D369 /* Frameworks */ = { + 38FCE1081BA8FC2E00E8F313 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 8D1F73DD1BA66AE50040D369 /* Frameworks */ = { + 38FCE1211BA8FC2F00E8F313 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -78,78 +63,77 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 8D1F73B31BA66AE50040D369 = { + 38FCE1021BA8FC2E00E8F313 = { isa = PBXGroup; children = ( - 8D1F73BE1BA66AE50040D369 /* PickAPic */, - 8D1F73D81BA66AE50040D369 /* PickAPicTests */, - 8D1F73E31BA66AE50040D369 /* PickAPicUITests */, - 8D1F73BD1BA66AE50040D369 /* Products */, + 38FCE10D1BA8FC2E00E8F313 /* PickAPic */, + 38FCE1271BA8FC2F00E8F313 /* PickAPicTests */, + 38FCE10C1BA8FC2E00E8F313 /* Products */, ); sourceTree = ""; }; - 8D1F73BD1BA66AE50040D369 /* Products */ = { + 38FCE10C1BA8FC2E00E8F313 /* Products */ = { isa = PBXGroup; children = ( - 8D1F73BC1BA66AE50040D369 /* PickAPic.app */, - 8D1F73D51BA66AE50040D369 /* PickAPicTests.xctest */, - 8D1F73E01BA66AE50040D369 /* PickAPicUITests.xctest */, + 38FCE10B1BA8FC2E00E8F313 /* PickAPic.app */, + 38FCE1241BA8FC2F00E8F313 /* PickAPicTests.xctest */, ); name = Products; sourceTree = ""; }; - 8D1F73BE1BA66AE50040D369 /* PickAPic */ = { + 38FCE10D1BA8FC2E00E8F313 /* PickAPic */ = { isa = PBXGroup; children = ( - 8D1F73C21BA66AE50040D369 /* AppDelegate.h */, - 8D1F73C31BA66AE50040D369 /* AppDelegate.m */, - 8D1F73C51BA66AE50040D369 /* ViewController.h */, - 8D1F73C61BA66AE50040D369 /* ViewController.m */, - 8D1F73C81BA66AE50040D369 /* Main.storyboard */, - 8D1F73CB1BA66AE50040D369 /* Assets.xcassets */, - 8D1F73CD1BA66AE50040D369 /* LaunchScreen.storyboard */, - 8D1F73D01BA66AE50040D369 /* Info.plist */, - 8D1F73BF1BA66AE50040D369 /* Supporting Files */, + 38FCE1121BA8FC2E00E8F313 /* AppDelegate.h */, + 38FCE1131BA8FC2E00E8F313 /* AppDelegate.m */, + 38FCE1151BA8FC2E00E8F313 /* ViewController.h */, + 38FCE1161BA8FC2E00E8F313 /* ViewController.m */, + 38FCE1181BA8FC2E00E8F313 /* Main.storyboard */, + 38FCE1341BA9020F00E8F313 /* SocialMainViewController.h */, + 38FCE1351BA9020F00E8F313 /* SocialMainViewController.m */, + 38FCE11B1BA8FC2E00E8F313 /* Images.xcassets */, + 38FCE11D1BA8FC2E00E8F313 /* LaunchScreen.xib */, + 38FCE10E1BA8FC2E00E8F313 /* Supporting Files */, ); path = PickAPic; sourceTree = ""; }; - 8D1F73BF1BA66AE50040D369 /* Supporting Files */ = { + 38FCE10E1BA8FC2E00E8F313 /* Supporting Files */ = { isa = PBXGroup; children = ( - 8D1F73C01BA66AE50040D369 /* main.m */, + 38FCE10F1BA8FC2E00E8F313 /* Info.plist */, + 38FCE1101BA8FC2E00E8F313 /* main.m */, ); name = "Supporting Files"; sourceTree = ""; }; - 8D1F73D81BA66AE50040D369 /* PickAPicTests */ = { + 38FCE1271BA8FC2F00E8F313 /* PickAPicTests */ = { isa = PBXGroup; children = ( - 8D1F73D91BA66AE50040D369 /* PickAPicTests.m */, - 8D1F73DB1BA66AE50040D369 /* Info.plist */, + 38FCE12A1BA8FC2F00E8F313 /* PickAPicTests.m */, + 38FCE1281BA8FC2F00E8F313 /* Supporting Files */, ); path = PickAPicTests; sourceTree = ""; }; - 8D1F73E31BA66AE50040D369 /* PickAPicUITests */ = { + 38FCE1281BA8FC2F00E8F313 /* Supporting Files */ = { isa = PBXGroup; children = ( - 8D1F73E41BA66AE50040D369 /* PickAPicUITests.m */, - 8D1F73E61BA66AE50040D369 /* Info.plist */, + 38FCE1291BA8FC2F00E8F313 /* Info.plist */, ); - path = PickAPicUITests; + name = "Supporting Files"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D1F73BB1BA66AE50040D369 /* PickAPic */ = { + 38FCE10A1BA8FC2E00E8F313 /* PickAPic */ = { isa = PBXNativeTarget; - buildConfigurationList = 8D1F73E91BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPic" */; + buildConfigurationList = 38FCE12E1BA8FC2F00E8F313 /* Build configuration list for PBXNativeTarget "PickAPic" */; buildPhases = ( - 8D1F73B81BA66AE50040D369 /* Sources */, - 8D1F73B91BA66AE50040D369 /* Frameworks */, - 8D1F73BA1BA66AE50040D369 /* Resources */, + 38FCE1071BA8FC2E00E8F313 /* Sources */, + 38FCE1081BA8FC2E00E8F313 /* Frameworks */, + 38FCE1091BA8FC2E00E8F313 /* Resources */, ); buildRules = ( ); @@ -157,68 +141,46 @@ ); name = PickAPic; productName = PickAPic; - productReference = 8D1F73BC1BA66AE50040D369 /* PickAPic.app */; + productReference = 38FCE10B1BA8FC2E00E8F313 /* PickAPic.app */; productType = "com.apple.product-type.application"; }; - 8D1F73D41BA66AE50040D369 /* PickAPicTests */ = { + 38FCE1231BA8FC2F00E8F313 /* PickAPicTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 8D1F73EC1BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPicTests" */; + buildConfigurationList = 38FCE1311BA8FC2F00E8F313 /* Build configuration list for PBXNativeTarget "PickAPicTests" */; buildPhases = ( - 8D1F73D11BA66AE50040D369 /* Sources */, - 8D1F73D21BA66AE50040D369 /* Frameworks */, - 8D1F73D31BA66AE50040D369 /* Resources */, + 38FCE1201BA8FC2F00E8F313 /* Sources */, + 38FCE1211BA8FC2F00E8F313 /* Frameworks */, + 38FCE1221BA8FC2F00E8F313 /* Resources */, ); buildRules = ( ); dependencies = ( - 8D1F73D71BA66AE50040D369 /* PBXTargetDependency */, + 38FCE1261BA8FC2F00E8F313 /* PBXTargetDependency */, ); name = PickAPicTests; productName = PickAPicTests; - productReference = 8D1F73D51BA66AE50040D369 /* PickAPicTests.xctest */; + productReference = 38FCE1241BA8FC2F00E8F313 /* PickAPicTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 8D1F73DF1BA66AE50040D369 /* PickAPicUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8D1F73EF1BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPicUITests" */; - buildPhases = ( - 8D1F73DC1BA66AE50040D369 /* Sources */, - 8D1F73DD1BA66AE50040D369 /* Frameworks */, - 8D1F73DE1BA66AE50040D369 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 8D1F73E21BA66AE50040D369 /* PBXTargetDependency */, - ); - name = PickAPicUITests; - productName = PickAPicUITests; - productReference = 8D1F73E01BA66AE50040D369 /* PickAPicUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 8D1F73B41BA66AE50040D369 /* Project object */ = { + 38FCE1031BA8FC2E00E8F313 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Mike Kavouras"; + LastUpgradeCheck = 0640; + ORGANIZATIONNAME = Henna; TargetAttributes = { - 8D1F73BB1BA66AE50040D369 = { - CreatedOnToolsVersion = 7.0; - }; - 8D1F73D41BA66AE50040D369 = { - CreatedOnToolsVersion = 7.0; - TestTargetID = 8D1F73BB1BA66AE50040D369; + 38FCE10A1BA8FC2E00E8F313 = { + CreatedOnToolsVersion = 6.4; }; - 8D1F73DF1BA66AE50040D369 = { - CreatedOnToolsVersion = 7.0; - TestTargetID = 8D1F73BB1BA66AE50040D369; + 38FCE1231BA8FC2F00E8F313 = { + CreatedOnToolsVersion = 6.4; + TestTargetID = 38FCE10A1BA8FC2E00E8F313; }; }; }; - buildConfigurationList = 8D1F73B71BA66AE50040D369 /* Build configuration list for PBXProject "PickAPic" */; + buildConfigurationList = 38FCE1061BA8FC2E00E8F313 /* Build configuration list for PBXProject "PickAPic" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -226,37 +188,29 @@ en, Base, ); - mainGroup = 8D1F73B31BA66AE50040D369; - productRefGroup = 8D1F73BD1BA66AE50040D369 /* Products */; + mainGroup = 38FCE1021BA8FC2E00E8F313; + productRefGroup = 38FCE10C1BA8FC2E00E8F313 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 8D1F73BB1BA66AE50040D369 /* PickAPic */, - 8D1F73D41BA66AE50040D369 /* PickAPicTests */, - 8D1F73DF1BA66AE50040D369 /* PickAPicUITests */, + 38FCE10A1BA8FC2E00E8F313 /* PickAPic */, + 38FCE1231BA8FC2F00E8F313 /* PickAPicTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 8D1F73BA1BA66AE50040D369 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D1F73CF1BA66AE50040D369 /* LaunchScreen.storyboard in Resources */, - 8D1F73CC1BA66AE50040D369 /* Assets.xcassets in Resources */, - 8D1F73CA1BA66AE50040D369 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D1F73D31BA66AE50040D369 /* Resources */ = { + 38FCE1091BA8FC2E00E8F313 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 38FCE11A1BA8FC2E00E8F313 /* Main.storyboard in Resources */, + 38FCE11F1BA8FC2E00E8F313 /* LaunchScreen.xib in Resources */, + 38FCE11C1BA8FC2E00E8F313 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 8D1F73DE1BA66AE50040D369 /* Resources */ = { + 38FCE1221BA8FC2F00E8F313 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -266,68 +220,56 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 8D1F73B81BA66AE50040D369 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D1F73C71BA66AE50040D369 /* ViewController.m in Sources */, - 8D1F73C41BA66AE50040D369 /* AppDelegate.m in Sources */, - 8D1F73C11BA66AE50040D369 /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D1F73D11BA66AE50040D369 /* Sources */ = { + 38FCE1071BA8FC2E00E8F313 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D1F73DA1BA66AE50040D369 /* PickAPicTests.m in Sources */, + 38FCE1361BA9020F00E8F313 /* SocialMainViewController.m in Sources */, + 38FCE1171BA8FC2E00E8F313 /* ViewController.m in Sources */, + 38FCE1141BA8FC2E00E8F313 /* AppDelegate.m in Sources */, + 38FCE1111BA8FC2E00E8F313 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 8D1F73DC1BA66AE50040D369 /* Sources */ = { + 38FCE1201BA8FC2F00E8F313 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D1F73E51BA66AE50040D369 /* PickAPicUITests.m in Sources */, + 38FCE12B1BA8FC2F00E8F313 /* PickAPicTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 8D1F73D71BA66AE50040D369 /* PBXTargetDependency */ = { + 38FCE1261BA8FC2F00E8F313 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 8D1F73BB1BA66AE50040D369 /* PickAPic */; - targetProxy = 8D1F73D61BA66AE50040D369 /* PBXContainerItemProxy */; - }; - 8D1F73E21BA66AE50040D369 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D1F73BB1BA66AE50040D369 /* PickAPic */; - targetProxy = 8D1F73E11BA66AE50040D369 /* PBXContainerItemProxy */; + target = 38FCE10A1BA8FC2E00E8F313 /* PickAPic */; + targetProxy = 38FCE1251BA8FC2F00E8F313 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 8D1F73C81BA66AE50040D369 /* Main.storyboard */ = { + 38FCE1181BA8FC2E00E8F313 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 8D1F73C91BA66AE50040D369 /* Base */, + 38FCE1191BA8FC2E00E8F313 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 8D1F73CD1BA66AE50040D369 /* LaunchScreen.storyboard */ = { + 38FCE11D1BA8FC2E00E8F313 /* LaunchScreen.xib */ = { isa = PBXVariantGroup; children = ( - 8D1F73CE1BA66AE50040D369 /* Base */, + 38FCE11E1BA8FC2E00E8F313 /* Base */, ); - name = LaunchScreen.storyboard; + name = LaunchScreen.xib; sourceTree = ""; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 8D1F73E71BA66AE50040D369 /* Debug */ = { + 38FCE12C1BA8FC2F00E8F313 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -346,9 +288,8 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -357,20 +298,21 @@ "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 = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; }; - 8D1F73E81BA66AE50040D369 /* Release */ = { + 38FCE12D1BA8FC2F00E8F313 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -400,125 +342,98 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; }; - 8D1F73EA1BA66AE50040D369 /* Debug */ = { + 38FCE12F1BA8FC2F00E8F313 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = PickAPic/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; - 8D1F73EB1BA66AE50040D369 /* Release */ = { + 38FCE1301BA8FC2F00E8F313 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = PickAPic/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPic; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; - 8D1F73ED1BA66AE50040D369 /* Debug */ = { + 38FCE1321BA8FC2F00E8F313 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); INFOPLIST_FILE = PickAPicTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPicTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PickAPic.app/PickAPic"; }; name = Debug; }; - 8D1F73EE1BA66AE50040D369 /* Release */ = { + 38FCE1331BA8FC2F00E8F313 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); INFOPLIST_FILE = PickAPicTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPicTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PickAPic.app/PickAPic"; }; name = Release; }; - 8D1F73F01BA66AE50040D369 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PickAPicUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPicUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = PickAPic; - USES_XCTRUNNER = YES; - }; - name = Debug; - }; - 8D1F73F11BA66AE50040D369 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PickAPicUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.PickAPicUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_TARGET_NAME = PickAPic; - USES_XCTRUNNER = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 8D1F73B71BA66AE50040D369 /* Build configuration list for PBXProject "PickAPic" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8D1F73E71BA66AE50040D369 /* Debug */, - 8D1F73E81BA66AE50040D369 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8D1F73E91BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPic" */ = { + 38FCE1061BA8FC2E00E8F313 /* Build configuration list for PBXProject "PickAPic" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8D1F73EA1BA66AE50040D369 /* Debug */, - 8D1F73EB1BA66AE50040D369 /* Release */, + 38FCE12C1BA8FC2F00E8F313 /* Debug */, + 38FCE12D1BA8FC2F00E8F313 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8D1F73EC1BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPicTests" */ = { + 38FCE12E1BA8FC2F00E8F313 /* Build configuration list for PBXNativeTarget "PickAPic" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8D1F73ED1BA66AE50040D369 /* Debug */, - 8D1F73EE1BA66AE50040D369 /* Release */, + 38FCE12F1BA8FC2F00E8F313 /* Debug */, + 38FCE1301BA8FC2F00E8F313 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8D1F73EF1BA66AE50040D369 /* Build configuration list for PBXNativeTarget "PickAPicUITests" */ = { + 38FCE1311BA8FC2F00E8F313 /* Build configuration list for PBXNativeTarget "PickAPicTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8D1F73F01BA66AE50040D369 /* Debug */, - 8D1F73F11BA66AE50040D369 /* Release */, + 38FCE1321BA8FC2F00E8F313 /* Debug */, + 38FCE1331BA8FC2F00E8F313 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 8D1F73B41BA66AE50040D369 /* Project object */; + rootObject = 38FCE1031BA8FC2E00E8F313 /* Project object */; } diff --git a/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcshareddata/PickAPic.xccheckout b/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcshareddata/PickAPic.xccheckout new file mode 100644 index 0000000..dcd487e --- /dev/null +++ b/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcshareddata/PickAPic.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + B7807C17-4D73-4B10-8EF6-C5A96D57C338 + IDESourceControlProjectName + PickAPic + IDESourceControlProjectOriginsDictionary + + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + https://github.com/xhenna92/unit-2-hw-0.git + + IDESourceControlProjectPath + PickAPic/PickAPic.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + ../../.. + + IDESourceControlProjectURL + https://github.com/xhenna92/unit-2-hw-0.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 30574ED234DE2144597F5C1E54D4E002E32C4ECC + IDESourceControlWCCName + unit-2-hw-0 + + + + diff --git a/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate b/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..f239e50 Binary files /dev/null and b/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/Afsana.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate b/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index e6e1ce4..0000000 Binary files a/PickAPic/PickAPic.xcodeproj/project.xcworkspace/xcuserdata/mikekavouras.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PickAPic.xcscheme b/PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PickAPic.xcscheme similarity index 80% rename from PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PickAPic.xcscheme rename to PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PickAPic.xcscheme index 72d7729..993c585 100644 --- a/PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/PickAPic.xcscheme +++ b/PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/PickAPic.xcscheme @@ -1,6 +1,6 @@ + + + + + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> - - - - - - @@ -85,16 +86,16 @@ diff --git a/PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist b/PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 74% rename from PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist rename to PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist index bb91a10..f980e83 100644 --- a/PickAPic/PickAPic.xcodeproj/xcuserdata/mikekavouras.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/PickAPic/PickAPic.xcodeproj/xcuserdata/Afsana.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,17 +12,12 @@ SuppressBuildableAutocreation - 8D1F73BB1BA66AE50040D369 + 38FCE10A1BA8FC2E00E8F313 primary - 8D1F73D41BA66AE50040D369 - - primary - - - 8D1F73DF1BA66AE50040D369 + 38FCE1231BA8FC2F00E8F313 primary diff --git a/PickAPic/PickAPic/AppDelegate.h b/PickAPic/PickAPic/AppDelegate.h index e6ae6b1..615d76f 100644 --- a/PickAPic/PickAPic/AppDelegate.h +++ b/PickAPic/PickAPic/AppDelegate.h @@ -2,8 +2,8 @@ // AppDelegate.h // PickAPic // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PickAPic/PickAPic/AppDelegate.m b/PickAPic/PickAPic/AppDelegate.m index 81a6d33..b5e9e42 100644 --- a/PickAPic/PickAPic/AppDelegate.m +++ b/PickAPic/PickAPic/AppDelegate.m @@ -2,8 +2,8 @@ // AppDelegate.m // PickAPic // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import "AppDelegate.h" diff --git a/PickAPic/PickAPic/Base.lproj/LaunchScreen.storyboard b/PickAPic/PickAPic/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 2e721e1..0000000 --- a/PickAPic/PickAPic/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PickAPic/PickAPic/Base.lproj/LaunchScreen.xib b/PickAPic/PickAPic/Base.lproj/LaunchScreen.xib new file mode 100644 index 0000000..46dfef0 --- /dev/null +++ b/PickAPic/PickAPic/Base.lproj/LaunchScreen.xib @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PickAPic/PickAPic/Base.lproj/Main.storyboard b/PickAPic/PickAPic/Base.lproj/Main.storyboard index f055f71..f4d5f1a 100644 --- a/PickAPic/PickAPic/Base.lproj/Main.storyboard +++ b/PickAPic/PickAPic/Base.lproj/Main.storyboard @@ -1,27 +1,71 @@ - + - - + + + - + - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/PickAPic/PickAPic/Assets.xcassets/AppIcon.appiconset/Contents.json b/PickAPic/PickAPic/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PickAPic/PickAPic/Assets.xcassets/AppIcon.appiconset/Contents.json rename to PickAPic/PickAPic/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/PickAPic/PickAPic/Info.plist b/PickAPic/PickAPic/Info.plist index 6905cc6..3a7483e 100644 --- a/PickAPic/PickAPic/Info.plist +++ b/PickAPic/PickAPic/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + nyc.c4q.xhenna92.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/PickAPic/PickAPic/SocialMainViewController.h b/PickAPic/PickAPic/SocialMainViewController.h new file mode 100644 index 0000000..9f9dff7 --- /dev/null +++ b/PickAPic/PickAPic/SocialMainViewController.h @@ -0,0 +1,13 @@ +// +// SocialMainViewController.h +// PickAPic +// +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. +// + +#import + +@interface SocialMainViewController : UIViewController + +@end diff --git a/PickAPic/PickAPic/SocialMainViewController.m b/PickAPic/PickAPic/SocialMainViewController.m new file mode 100644 index 0000000..32e166b --- /dev/null +++ b/PickAPic/PickAPic/SocialMainViewController.m @@ -0,0 +1,37 @@ +// +// SocialMainViewController.m +// PickAPic +// +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. +// + +#import "SocialMainViewController.h" + +@interface SocialMainViewController () + +@end + +@implementation SocialMainViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/PickAPic/PickAPic/ViewController.h b/PickAPic/PickAPic/ViewController.h index dee0930..a5a400c 100644 --- a/PickAPic/PickAPic/ViewController.h +++ b/PickAPic/PickAPic/ViewController.h @@ -2,8 +2,8 @@ // ViewController.h // PickAPic // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PickAPic/PickAPic/ViewController.m b/PickAPic/PickAPic/ViewController.m index acd6613..e162c94 100644 --- a/PickAPic/PickAPic/ViewController.m +++ b/PickAPic/PickAPic/ViewController.m @@ -2,17 +2,42 @@ // ViewController.m // PickAPic // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import "ViewController.h" -@interface ViewController () +@interface ViewController () +@property (weak, nonatomic) IBOutlet UIImageView *imageView; @end @implementation ViewController +- (IBAction)cameraRollTapped:(UIButton *)sender { + UIImagePickerController *picker = [[UIImagePickerController alloc] init]; + picker.delegate = self; + picker.allowsEditing = YES; + picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; + + [self presentViewController:picker animated:YES completion:NULL]; +} + +- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { + + UIImage *chosenImage = info[UIImagePickerControllerEditedImage]; + self.imageView.image = chosenImage; + + [picker dismissViewControllerAnimated:YES completion:NULL]; + +} + +- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker { + + [picker dismissViewControllerAnimated:YES completion:NULL]; + +} + @end diff --git a/PickAPic/PickAPic/main.m b/PickAPic/PickAPic/main.m index e7acc84..03140ff 100644 --- a/PickAPic/PickAPic/main.m +++ b/PickAPic/PickAPic/main.m @@ -2,8 +2,8 @@ // main.m // PickAPic // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // #import diff --git a/PickAPic/PickAPicTests/Info.plist b/PickAPic/PickAPicTests/Info.plist index ba72822..d03d7a9 100644 --- a/PickAPic/PickAPicTests/Info.plist +++ b/PickAPic/PickAPicTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + nyc.c4q.xhenna92.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/PickAPic/PickAPicTests/PickAPicTests.m b/PickAPic/PickAPicTests/PickAPicTests.m index aecb92a..716d5c9 100644 --- a/PickAPic/PickAPicTests/PickAPicTests.m +++ b/PickAPic/PickAPicTests/PickAPicTests.m @@ -2,10 +2,11 @@ // PickAPicTests.m // PickAPicTests // -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. +// Created by Henna on 9/15/15. +// Copyright (c) 2015 Henna. All rights reserved. // +#import #import @interface PickAPicTests : XCTestCase @@ -26,7 +27,7 @@ - (void)tearDown { - (void)testExample { // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. + XCTAssert(YES, @"Pass"); } - (void)testPerformanceExample { diff --git a/PickAPic/PickAPicUITests/Info.plist b/PickAPic/PickAPicUITests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/PickAPic/PickAPicUITests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/PickAPic/PickAPicUITests/PickAPicUITests.m b/PickAPic/PickAPicUITests/PickAPicUITests.m deleted file mode 100644 index 77cd60b..0000000 --- a/PickAPic/PickAPicUITests/PickAPicUITests.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// PickAPicUITests.m -// PickAPicUITests -// -// Created by Michael Kavouras on 9/13/15. -// Copyright © 2015 Mike Kavouras. All rights reserved. -// - -#import - -@interface PickAPicUITests : XCTestCase - -@end - -@implementation PickAPicUITests - -- (void)setUp { - [super setUp]; - - // Put setup code here. This method is called before the invocation of each test method in the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - self.continueAfterFailure = NO; - // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method. - [[[XCUIApplication alloc] init] launch]; - - // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. -} - -@end