Skip to content

Pr #28

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
elberdev wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Pr #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b091d4
initial commit
Feb 21, 2016
5be8bdc
stuff
Feb 21, 2016
6335625
basic requirements
Feb 21, 2016
8d2da18
added api functionality
Feb 21, 2016
9eb087c
player can now exit game at any time and still get a score
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
build/
DerivedData

*.DS_Store

## Various settings
*.pbxuser
!default.pbxuser
Expand Down Expand Up @@ -44,7 +46,7 @@ Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
Expand Down
102 changes: 96 additions & 6 deletions HeadsUpper/HeadsUpper.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,31 @@
objects = {

/* Begin PBXBuildFile section */
3B56E6241C7A319700358B32 /* CategoriesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B56E6231C7A319700358B32 /* CategoriesTableViewController.m */; };
3B56E62A1C7A4DB700358B32 /* QuestionsAPIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B56E6291C7A4DB700358B32 /* QuestionsAPIManager.m */; };
3B5C1B781C7A1DB800A57C51 /* QuestionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B5C1B771C7A1DB800A57C51 /* QuestionsViewController.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 */; };
C80C6341BC2902BD9EE7B74E /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B9E23B2435BBFE1F990751C /* libPods.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0B9E23B2435BBFE1F990751C /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
3B56E6221C7A319700358B32 /* CategoriesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CategoriesTableViewController.h; sourceTree = "<group>"; };
3B56E6231C7A319700358B32 /* CategoriesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CategoriesTableViewController.m; sourceTree = "<group>"; };
3B56E6281C7A4DB700358B32 /* QuestionsAPIManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuestionsAPIManager.h; sourceTree = "<group>"; };
3B56E6291C7A4DB700358B32 /* QuestionsAPIManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuestionsAPIManager.m; sourceTree = "<group>"; };
3B5C1B761C7A1DB800A57C51 /* QuestionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuestionsViewController.h; sourceTree = "<group>"; };
3B5C1B771C7A1DB800A57C51 /* QuestionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuestionsViewController.m; sourceTree = "<group>"; };
3BB7D537164A471EE93CDBB2 /* 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>"; };
5E851FB55FFBAFE783D904E4 /* 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>"; };
Expand All @@ -33,17 +43,29 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C80C6341BC2902BD9EE7B74E /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
268A04293E154DECE1C4BA61 /* Pods */ = {
isa = PBXGroup;
children = (
3BB7D537164A471EE93CDBB2 /* Pods.debug.xcconfig */,
5E851FB55FFBAFE783D904E4 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
8D89694E1C755D0200D32E8A = {
isa = PBXGroup;
children = (
8D8969591C755D0200D32E8A /* HeadsUpper */,
8D8969581C755D0200D32E8A /* Products */,
268A04293E154DECE1C4BA61 /* Pods */,
B2936C109ED4087D7AA3EAD9 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -60,8 +82,12 @@
children = (
8D89695D1C755D0200D32E8A /* AppDelegate.h */,
8D89695E1C755D0200D32E8A /* AppDelegate.m */,
8D8969601C755D0200D32E8A /* ViewController.h */,
8D8969611C755D0200D32E8A /* ViewController.m */,
3B56E6221C7A319700358B32 /* CategoriesTableViewController.h */,
3B56E6231C7A319700358B32 /* CategoriesTableViewController.m */,
3B56E6281C7A4DB700358B32 /* QuestionsAPIManager.h */,
3B56E6291C7A4DB700358B32 /* QuestionsAPIManager.m */,
3B5C1B761C7A1DB800A57C51 /* QuestionsViewController.h */,
3B5C1B771C7A1DB800A57C51 /* QuestionsViewController.m */,
8D8969631C755D0200D32E8A /* Main.storyboard */,
8D8969661C755D0200D32E8A /* Assets.xcassets */,
8D8969681C755D0200D32E8A /* LaunchScreen.storyboard */,
Expand All @@ -79,16 +105,27 @@
name = "Supporting Files";
sourceTree = "<group>";
};
B2936C109ED4087D7AA3EAD9 /* Frameworks */ = {
isa = PBXGroup;
children = (
0B9E23B2435BBFE1F990751C /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
8D8969561C755D0200D32E8A /* HeadsUpper */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8D89696E1C755D0200D32E8A /* Build configuration list for PBXNativeTarget "HeadsUpper" */;
buildPhases = (
65AC7277492AA05628894A72 /* Check Pods Manifest.lock */,
8D8969531C755D0200D32E8A /* Sources */,
8D8969541C755D0200D32E8A /* Frameworks */,
8D8969551C755D0200D32E8A /* Resources */,
D2ADAEA4827A3DE66EF29135 /* Embed Pods Frameworks */,
9ABB105DC6A21AC77128A324 /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -144,14 +181,64 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
65AC7277492AA05628894A72 /* 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;
};
9ABB105DC6A21AC77128A324 /* 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;
};
D2ADAEA4827A3DE66EF29135 /* 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 */,
3B5C1B781C7A1DB800A57C51 /* QuestionsViewController.m in Sources */,
3B56E62A1C7A4DB700358B32 /* QuestionsAPIManager.m in Sources */,
8D89695F1C755D0200D32E8A /* AppDelegate.m in Sources */,
8D89695C1C755D0200D32E8A /* main.m in Sources */,
3B56E6241C7A319700358B32 /* CategoriesTableViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -259,6 +346,7 @@
};
8D89696F1C755D0200D32E8A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3BB7D537164A471EE93CDBB2 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = HeadsUpper/Info.plist;
Expand All @@ -271,6 +359,7 @@
};
8D8969701C755D0200D32E8A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5E851FB55FFBAFE783D904E4 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = HeadsUpper/Info.plist;
Expand Down Expand Up @@ -300,6 +389,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.

6 changes: 3 additions & 3 deletions HeadsUpper/HeadsUpper/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,7 +16,6 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
Expand Down
Loading