Skip to content

Justine_final-assessment-ios-pt2 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JustineKay wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Justine_final-assessment-ios-pt2 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
da922ba
Set up main viewControllers and gameView nib
Feb 21, 2016
41ea828
UICollectionView delegate and datasource protocols implemented
Feb 21, 2016
4f6b075
Game view nib loading successfully in GameVC
Feb 21, 2016
700e828
Set up segue from collectionViewCells to gameView
Feb 21, 2016
689149b
Started setting up collectionView layout
Feb 21, 2016
4899c5c
Created custom collectionViewCell
Feb 21, 2016
31ae8f6
Added AFNetworking
Feb 21, 2016
ca7f318
API get request successful
Feb 21, 2016
4ffc187
Main menu collectionView loading successfully with topics data
Feb 21, 2016
18f593e
Successfully peeking and popping answers with swipe gestures
Feb 21, 2016
886cd38
Added animation to correct/pass label in swipe gesture method
Feb 21, 2016
3a8c8b9
Refactoring gameView, adding NSTimer
Feb 21, 2016
df333b5
Currently running two timers, but not successfully
Feb 21, 2016
71a879f
Successfully updating intro/game timer and labels
Feb 21, 2016
3a3bba4
Successfully showing results
Feb 21, 2016
33341d2
Successfully removing gesture recognizers when gameTime is up
Feb 21, 2016
3d81ff9
Added borders to the collectionViewCells, timer is invalidated when g…
Feb 21, 2016
17e6d17
added buttons to replay and go back to main menu after game played
Feb 21, 2016
2f0aa86
Fixed minor bug in GameVC
Feb 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 127 additions & 8 deletions HeadsUpper/HeadsUpper.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,77 @@
objects = {

/* Begin PBXBuildFile section */
560A5D4CA4C004DFE9C1D219 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EF0437499A36D98854C52881 /* libPods.a */; };
6B18A1B11C7A125D0006C070 /* MainMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1B01C7A125D0006C070 /* MainMenuViewController.m */; };
6B18A1B41C7A128E0006C070 /* GameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1B31C7A128E0006C070 /* GameViewController.m */; };
6B18A1B61C7A13590006C070 /* GameView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6B18A1B51C7A13590006C070 /* GameView.xib */; };
6B18A1B91C7A15DB0006C070 /* GameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1B81C7A15DB0006C070 /* GameView.m */; };
6B18A1BC1C7A2AB20006C070 /* Topic.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1BB1C7A2AB20006C070 /* Topic.m */; };
6B18A1BF1C7A2AD10006C070 /* TopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1BE1C7A2AD10006C070 /* TopicCollectionViewCell.m */; };
6B18A1C11C7A2AEB0006C070 /* TopicCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6B18A1C01C7A2AEB0006C070 /* TopicCollectionViewCell.xib */; };
6B18A1C41C7A352F0006C070 /* APIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B18A1C31C7A352F0006C070 /* APIManager.m */; };
8D89695C1C755D0200D32E8A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D89695B1C755D0200D32E8A /* main.m */; };
8D89695F1C755D0200D32E8A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D89695E1C755D0200D32E8A /* AppDelegate.m */; };
8D8969621C755D0200D32E8A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D8969611C755D0200D32E8A /* ViewController.m */; };
8D8969651C755D0200D32E8A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D8969631C755D0200D32E8A /* Main.storyboard */; };
8D8969671C755D0200D32E8A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D8969661C755D0200D32E8A /* Assets.xcassets */; };
8D89696A1C755D0200D32E8A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D8969681C755D0200D32E8A /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
6B18A1AF1C7A125D0006C070 /* MainMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainMenuViewController.h; sourceTree = "<group>"; };
6B18A1B01C7A125D0006C070 /* MainMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuViewController.m; sourceTree = "<group>"; };
6B18A1B21C7A128E0006C070 /* GameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameViewController.h; sourceTree = "<group>"; };
6B18A1B31C7A128E0006C070 /* GameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameViewController.m; sourceTree = "<group>"; };
6B18A1B51C7A13590006C070 /* GameView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GameView.xib; sourceTree = "<group>"; };
6B18A1B71C7A15DB0006C070 /* GameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameView.h; sourceTree = "<group>"; };
6B18A1B81C7A15DB0006C070 /* GameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameView.m; sourceTree = "<group>"; };
6B18A1BA1C7A2AB20006C070 /* Topic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Topic.h; sourceTree = "<group>"; };
6B18A1BB1C7A2AB20006C070 /* Topic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Topic.m; sourceTree = "<group>"; };
6B18A1BD1C7A2AD10006C070 /* TopicCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicCollectionViewCell.h; sourceTree = "<group>"; };
6B18A1BE1C7A2AD10006C070 /* TopicCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicCollectionViewCell.m; sourceTree = "<group>"; };
6B18A1C01C7A2AEB0006C070 /* TopicCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TopicCollectionViewCell.xib; sourceTree = "<group>"; };
6B18A1C21C7A352F0006C070 /* APIManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIManager.h; sourceTree = "<group>"; };
6B18A1C31C7A352F0006C070 /* APIManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APIManager.m; sourceTree = "<group>"; };
868A5D64D1D4B1A1DFBA1F0D /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
86D066A731BFA599E5A32AFE /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
8D8969571C755D0200D32E8A /* HeadsUpper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HeadsUpper.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D89695B1C755D0200D32E8A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8D89695D1C755D0200D32E8A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8D89695E1C755D0200D32E8A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8D8969601C755D0200D32E8A /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
8D8969611C755D0200D32E8A /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8D8969641C755D0200D32E8A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8D8969661C755D0200D32E8A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8D8969691C755D0200D32E8A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8D89696B1C755D0200D32E8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EF0437499A36D98854C52881 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
8D8969541C755D0200D32E8A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
560A5D4CA4C004DFE9C1D219 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
653840CABFA830772FB0AC7A /* Frameworks */ = {
isa = PBXGroup;
children = (
EF0437499A36D98854C52881 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
8D89694E1C755D0200D32E8A = {
isa = PBXGroup;
children = (
8D8969591C755D0200D32E8A /* HeadsUpper */,
8D8969581C755D0200D32E8A /* Products */,
981B8B46F54812DBC642DD95 /* Pods */,
653840CABFA830772FB0AC7A /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -60,8 +94,20 @@
children = (
8D89695D1C755D0200D32E8A /* AppDelegate.h */,
8D89695E1C755D0200D32E8A /* AppDelegate.m */,
8D8969601C755D0200D32E8A /* ViewController.h */,
8D8969611C755D0200D32E8A /* ViewController.m */,
6B18A1C21C7A352F0006C070 /* APIManager.h */,
6B18A1C31C7A352F0006C070 /* APIManager.m */,
6B18A1BA1C7A2AB20006C070 /* Topic.h */,
6B18A1BB1C7A2AB20006C070 /* Topic.m */,
6B18A1BD1C7A2AD10006C070 /* TopicCollectionViewCell.h */,
6B18A1BE1C7A2AD10006C070 /* TopicCollectionViewCell.m */,
6B18A1C01C7A2AEB0006C070 /* TopicCollectionViewCell.xib */,
6B18A1B71C7A15DB0006C070 /* GameView.h */,
6B18A1B81C7A15DB0006C070 /* GameView.m */,
6B18A1B51C7A13590006C070 /* GameView.xib */,
6B18A1B21C7A128E0006C070 /* GameViewController.h */,
6B18A1B31C7A128E0006C070 /* GameViewController.m */,
6B18A1AF1C7A125D0006C070 /* MainMenuViewController.h */,
6B18A1B01C7A125D0006C070 /* MainMenuViewController.m */,
8D8969631C755D0200D32E8A /* Main.storyboard */,
8D8969661C755D0200D32E8A /* Assets.xcassets */,
8D8969681C755D0200D32E8A /* LaunchScreen.storyboard */,
Expand All @@ -79,16 +125,28 @@
name = "Supporting Files";
sourceTree = "<group>";
};
981B8B46F54812DBC642DD95 /* Pods */ = {
isa = PBXGroup;
children = (
868A5D64D1D4B1A1DFBA1F0D /* Pods.debug.xcconfig */,
86D066A731BFA599E5A32AFE /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
8D8969561C755D0200D32E8A /* HeadsUpper */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8D89696E1C755D0200D32E8A /* Build configuration list for PBXNativeTarget "HeadsUpper" */;
buildPhases = (
89356D6C49B75752AE00D121 /* Check Pods Manifest.lock */,
8D8969531C755D0200D32E8A /* Sources */,
8D8969541C755D0200D32E8A /* Frameworks */,
8D8969551C755D0200D32E8A /* Resources */,
F537919D5A09609868C619CF /* Embed Pods Frameworks */,
237DB39DE890E56F02D2CDBE /* Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -110,6 +168,7 @@
TargetAttributes = {
8D8969561C755D0200D32E8A = {
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = 8338VRHY69;
};
};
};
Expand All @@ -136,6 +195,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6B18A1C11C7A2AEB0006C070 /* TopicCollectionViewCell.xib in Resources */,
6B18A1B61C7A13590006C070 /* GameView.xib in Resources */,
8D89696A1C755D0200D32E8A /* LaunchScreen.storyboard in Resources */,
8D8969671C755D0200D32E8A /* Assets.xcassets in Resources */,
8D8969651C755D0200D32E8A /* Main.storyboard in Resources */,
Expand All @@ -144,13 +205,66 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
237DB39DE890E56F02D2CDBE /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
89356D6C49B75752AE00D121 /* 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;
};
F537919D5A09609868C619CF /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
8D8969531C755D0200D32E8A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D8969621C755D0200D32E8A /* ViewController.m in Sources */,
6B18A1B41C7A128E0006C070 /* GameViewController.m in Sources */,
6B18A1B91C7A15DB0006C070 /* GameView.m in Sources */,
6B18A1BF1C7A2AD10006C070 /* TopicCollectionViewCell.m in Sources */,
8D89695F1C755D0200D32E8A /* AppDelegate.m in Sources */,
6B18A1C41C7A352F0006C070 /* APIManager.m in Sources */,
6B18A1BC1C7A2AB20006C070 /* Topic.m in Sources */,
6B18A1B11C7A125D0006C070 /* MainMenuViewController.m in Sources */,
8D89695C1C755D0200D32E8A /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -259,24 +373,28 @@
};
8D89696F1C755D0200D32E8A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 868A5D64D1D4B1A1DFBA1F0D /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = HeadsUpper/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.HeadsUpper;
PRODUCT_BUNDLE_IDENTIFIER = com.justinekay.HeadsUpper;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
8D8969701C755D0200D32E8A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 86D066A731BFA599E5A32AFE /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = HeadsUpper/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.HeadsUpper;
PRODUCT_BUNDLE_IDENTIFIER = com.justinekay.HeadsUpper;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand All @@ -300,6 +418,7 @@
8D8969701C755D0200D32E8A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
10 changes: 10 additions & 0 deletions HeadsUpper/HeadsUpper.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions HeadsUpper/HeadsUpper/APIManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// APIManager.h
// HeadsUpper
//
// Created by Justine Gartner on 2/21/16.
// Copyright © 2016 Michael Kavouras. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "Topic.h"

@interface APIManager : NSObject

+ (void) getTopicData:(void(^)(NSDictionary *data))completion;

@end
30 changes: 30 additions & 0 deletions HeadsUpper/HeadsUpper/APIManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// APIManager.m
// HeadsUpper
//
// Created by Justine Gartner on 2/21/16.
// Copyright © 2016 Michael Kavouras. All rights reserved.
//

#import <AFNetworking/AFNetworking.h>
#import "APIManager.h"

@implementation APIManager

+ (void) getTopicData:(void(^)(NSDictionary *data))completion
{
AFHTTPSessionManager *manager = [[AFHTTPSessionManager alloc] init];

[manager GET:@"https://heads-up-api.herokuapp.com/" parameters:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {

NSDictionary *data = responseObject;
completion(data);

} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {

NSLog(@"%@", error);
}];

}

@end
Loading