Skip to content

Mesfin's Final Assessment Part II #16

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

Mesfin's Final Assessment Part II #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
99ff7ef
progress
mesbekmek Feb 21, 2016
83c8f97
More progress
mesbekmek Feb 21, 2016
8d902b8
Setup tableview controller and game viewcontroller, passing data corr…
mesbekmek Feb 21, 2016
e1cee1c
Added Game score formatter class
mesbekmek Feb 21, 2016
0bb96e1
Cleaner GameViewController code
mesbekmek Feb 21, 2016
a6430e6
add timer and timer label
mesbekmek Feb 21, 2016
0a3359f
working version
mesbekmek Feb 21, 2016
c336ce0
added animation to swipes
mesbekmek Feb 21, 2016
3d47bd0
added code to invalidate timer
mesbekmek Feb 21, 2016
9e08f78
Added new category (iOS legends)
mesbekmek Feb 21, 2016
a1e1753
added accelerometer code
mesbekmek Feb 21, 2016
2c489cc
Added launch screen, final push
mesbekmek 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
80 changes: 72 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,21 +7,33 @@
objects = {

/* Begin PBXBuildFile section */
1887DC561C7A11670037888D /* HUCategoriesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1887DC551C7A11670037888D /* HUCategoriesTableViewController.m */; };
1887DC591C7A11900037888D /* HUGameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1887DC581C7A11900037888D /* HUGameViewController.m */; };
1887DC5F1C7A11F00037888D /* HUGameCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1887DC5E1C7A11F00037888D /* HUGameCategory.m */; };
1887DC621C7A17320037888D /* CategoryAndClueSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1887DC611C7A17320037888D /* CategoryAndClueSetup.m */; };
18B3CAEA1C7A2C690057381E /* HUGameCategory+GameScore.m in Sources */ = {isa = PBXBuildFile; fileRef = 18B3CAE91C7A2C690057381E /* HUGameCategory+GameScore.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 */
1887DC541C7A11670037888D /* HUCategoriesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HUCategoriesTableViewController.h; sourceTree = "<group>"; };
1887DC551C7A11670037888D /* HUCategoriesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HUCategoriesTableViewController.m; sourceTree = "<group>"; };
1887DC571C7A11900037888D /* HUGameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HUGameViewController.h; sourceTree = "<group>"; };
1887DC581C7A11900037888D /* HUGameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HUGameViewController.m; sourceTree = "<group>"; };
1887DC5D1C7A11F00037888D /* HUGameCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HUGameCategory.h; sourceTree = "<group>"; };
1887DC5E1C7A11F00037888D /* HUGameCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HUGameCategory.m; sourceTree = "<group>"; };
1887DC601C7A17320037888D /* CategoryAndClueSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CategoryAndClueSetup.h; sourceTree = "<group>"; };
1887DC611C7A17320037888D /* CategoryAndClueSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CategoryAndClueSetup.m; sourceTree = "<group>"; };
18B3CAE81C7A2C690057381E /* HUGameCategory+GameScore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HUGameCategory+GameScore.h"; sourceTree = "<group>"; };
18B3CAE91C7A2C690057381E /* HUGameCategory+GameScore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HUGameCategory+GameScore.m"; 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 @@ -39,6 +51,44 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
18201EE31C7A546E0027F5F2 /* Categories */ = {
isa = PBXGroup;
children = (
18B3CAE81C7A2C690057381E /* HUGameCategory+GameScore.h */,
18B3CAE91C7A2C690057381E /* HUGameCategory+GameScore.m */,
);
name = Categories;
sourceTree = "<group>";
};
18201EE41C7A54980027F5F2 /* ViewControllers */ = {
isa = PBXGroup;
children = (
1887DC541C7A11670037888D /* HUCategoriesTableViewController.h */,
1887DC551C7A11670037888D /* HUCategoriesTableViewController.m */,
1887DC571C7A11900037888D /* HUGameViewController.h */,
1887DC581C7A11900037888D /* HUGameViewController.m */,
);
name = ViewControllers;
sourceTree = "<group>";
};
18201EE51C7A54A80027F5F2 /* SetupHelperClass */ = {
isa = PBXGroup;
children = (
1887DC601C7A17320037888D /* CategoryAndClueSetup.h */,
1887DC611C7A17320037888D /* CategoryAndClueSetup.m */,
);
name = SetupHelperClass;
sourceTree = "<group>";
};
18201EE61C7A54B90027F5F2 /* Model */ = {
isa = PBXGroup;
children = (
1887DC5D1C7A11F00037888D /* HUGameCategory.h */,
1887DC5E1C7A11F00037888D /* HUGameCategory.m */,
);
name = Model;
sourceTree = "<group>";
};
8D89694E1C755D0200D32E8A = {
isa = PBXGroup;
children = (
Expand All @@ -60,8 +110,10 @@
children = (
8D89695D1C755D0200D32E8A /* AppDelegate.h */,
8D89695E1C755D0200D32E8A /* AppDelegate.m */,
8D8969601C755D0200D32E8A /* ViewController.h */,
8D8969611C755D0200D32E8A /* ViewController.m */,
18201EE31C7A546E0027F5F2 /* Categories */,
18201EE61C7A54B90027F5F2 /* Model */,
18201EE51C7A54A80027F5F2 /* SetupHelperClass */,
18201EE41C7A54980027F5F2 /* ViewControllers */,
8D8969631C755D0200D32E8A /* Main.storyboard */,
8D8969661C755D0200D32E8A /* Assets.xcassets */,
8D8969681C755D0200D32E8A /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -110,6 +162,7 @@
TargetAttributes = {
8D8969561C755D0200D32E8A = {
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = BULEKXRKSR;
};
};
};
Expand Down Expand Up @@ -149,9 +202,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D8969621C755D0200D32E8A /* ViewController.m in Sources */,
1887DC561C7A11670037888D /* HUCategoriesTableViewController.m in Sources */,
8D89695F1C755D0200D32E8A /* AppDelegate.m in Sources */,
8D89695C1C755D0200D32E8A /* main.m in Sources */,
18B3CAEA1C7A2C690057381E /* HUGameCategory+GameScore.m in Sources */,
1887DC5F1C7A11F00037888D /* HUGameCategory.m in Sources */,
1887DC591C7A11900037888D /* HUGameViewController.m in Sources */,
1887DC621C7A17320037888D /* CategoryAndClueSetup.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -261,23 +318,29 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "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.mesfin.HeadsUpper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Debug;
};
8D8969701C755D0200D32E8A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "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.mesfin.HeadsUpper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand All @@ -300,6 +363,7 @@
8D8969701C755D0200D32E8A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
20 changes: 16 additions & 4 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="9531" systemVersion="15D21" 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="9529"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,8 +16,19 @@
<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"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="HEADS UP" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NHP-gc-7F0">
<rect key="frame" x="188" y="274" width="224" height="52"/>
<fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="40"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.18039215689999999" green="0.58823529409999997" blue="0.8980392157" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="NHP-gc-7F0" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="e4l-lU-SNK"/>
<constraint firstItem="NHP-gc-7F0" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="uPf-EC-JOX"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
Loading