Skip to content

done #15

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

done #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3251a3e
done
bereket6725 Feb 21, 2016
04aa950
found one last bug, haha
bereket6725 Feb 21, 2016
f8fe502
added another condition
bereket6725 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
25 changes: 19 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 @@ -9,23 +9,29 @@
/* Begin PBXBuildFile section */
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 */; };
ABC1469E1C7A480E00DAA182 /* SubjectsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC1469D1C7A480E00DAA182 /* SubjectsTableViewController.m */; };
ABC146A11C7A482A00DAA182 /* GuessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC146A01C7A482A00DAA182 /* GuessViewController.m */; };
ABC146AA1C7A4B5E00DAA182 /* SubjectsObjectModel.m in Sources */ = {isa = PBXBuildFile; fileRef = ABC146A91C7A4B5E00DAA182 /* SubjectsObjectModel.m */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
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>"; };
ABC1469C1C7A480E00DAA182 /* SubjectsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubjectsTableViewController.h; sourceTree = "<group>"; };
ABC1469D1C7A480E00DAA182 /* SubjectsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SubjectsTableViewController.m; sourceTree = "<group>"; };
ABC1469F1C7A482A00DAA182 /* GuessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuessViewController.h; sourceTree = "<group>"; };
ABC146A01C7A482A00DAA182 /* GuessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GuessViewController.m; sourceTree = "<group>"; };
ABC146A81C7A4B5E00DAA182 /* SubjectsObjectModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubjectsObjectModel.h; sourceTree = "<group>"; };
ABC146A91C7A4B5E00DAA182 /* SubjectsObjectModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SubjectsObjectModel.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -60,8 +66,12 @@
children = (
8D89695D1C755D0200D32E8A /* AppDelegate.h */,
8D89695E1C755D0200D32E8A /* AppDelegate.m */,
8D8969601C755D0200D32E8A /* ViewController.h */,
8D8969611C755D0200D32E8A /* ViewController.m */,
ABC146A81C7A4B5E00DAA182 /* SubjectsObjectModel.h */,
ABC146A91C7A4B5E00DAA182 /* SubjectsObjectModel.m */,
ABC1469C1C7A480E00DAA182 /* SubjectsTableViewController.h */,
ABC1469D1C7A480E00DAA182 /* SubjectsTableViewController.m */,
ABC1469F1C7A482A00DAA182 /* GuessViewController.h */,
ABC146A01C7A482A00DAA182 /* GuessViewController.m */,
8D8969631C755D0200D32E8A /* Main.storyboard */,
8D8969661C755D0200D32E8A /* Assets.xcassets */,
8D8969681C755D0200D32E8A /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -149,8 +159,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D8969621C755D0200D32E8A /* ViewController.m in Sources */,
ABC1469E1C7A480E00DAA182 /* SubjectsTableViewController.m in Sources */,
ABC146AA1C7A4B5E00DAA182 /* SubjectsObjectModel.m in Sources */,
8D89695F1C755D0200D32E8A /* AppDelegate.m in Sources */,
ABC146A11C7A482A00DAA182 /* GuessViewController.m in Sources */,
8D89695C1C755D0200D32E8A /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -300,6 +312,7 @@
8D8969701C755D0200D32E8A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
109 changes: 99 additions & 10 deletions HeadsUpper/HeadsUpper/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,114 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="14F1509" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="t5G-wu-U2m">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<!--Subjects Table View Controller-->
<scene sceneID="Kwv-hC-zeP">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<tableViewController id="t5G-wu-U2m" customClass="SubjectsTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="QzY-xM-ygW">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CellIdentifier" id="qCc-Pt-bKb">
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qCc-Pt-bKb" id="nCO-jR-76f">
<rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="t5G-wu-U2m" id="VBc-Sg-lGk"/>
<outlet property="delegate" destination="t5G-wu-U2m" id="Cck-KR-3um"/>
</connections>
</tableView>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iRb-Tc-6ws" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="273" y="150"/>
</scene>
<!--Guess View Controller-->
<scene sceneID="BYM-qK-Wy5">
<objects>
<viewController storyboardIdentifier="VCIdentifier" id="Ok5-dD-QpN" customClass="GuessViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
<viewControllerLayoutGuide type="top" id="Rjf-Wp-6f5"/>
<viewControllerLayoutGuide type="bottom" id="BHs-zd-nIc"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<view key="view" contentMode="scaleToFill" id="gVb-Q3-o7D">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ekf-f8-I91">
<rect key="frame" x="0.0" y="20" width="600" height="580"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfQ-Db-XHp">
<rect key="frame" x="235" y="267" width="131" height="47"/>
<fontDescription key="fontDescription" type="system" pointSize="39"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NuH-am-xdY">
<rect key="frame" x="280" y="445" width="42" height="41"/>
<constraints>
<constraint firstAttribute="width" constant="139" id="JhG-Z5-zeN"/>
<constraint firstAttribute="height" constant="127" id="cqx-3w-aZb"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="34"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="JhG-Z5-zeN"/>
<exclude reference="cqx-3w-aZb"/>
</mask>
</variation>
</label>
</subviews>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="NuH-am-xdY" firstAttribute="centerY" secondItem="Ekf-f8-I91" secondAttribute="centerY" id="3xY-wb-6Xh"/>
<constraint firstItem="NuH-am-xdY" firstAttribute="top" secondItem="PfQ-Db-XHp" secondAttribute="bottom" constant="190" id="7XR-L7-KFb"/>
<constraint firstItem="PfQ-Db-XHp" firstAttribute="centerY" secondItem="Ekf-f8-I91" secondAttribute="centerY" id="GTR-8f-g36"/>
<constraint firstItem="NuH-am-xdY" firstAttribute="centerY" secondItem="Ekf-f8-I91" secondAttribute="centerY" constant="175" id="N1b-dv-IJh"/>
<constraint firstItem="NuH-am-xdY" firstAttribute="centerX" secondItem="Ekf-f8-I91" secondAttribute="centerX" constant="1" id="RM7-x8-Thf"/>
<constraint firstItem="NuH-am-xdY" firstAttribute="leading" secondItem="Ekf-f8-I91" secondAttribute="leading" constant="206" id="lcN-jE-NXC"/>
<constraint firstItem="PfQ-Db-XHp" firstAttribute="centerX" secondItem="Ekf-f8-I91" secondAttribute="centerX" id="svS-es-Th2"/>
<constraint firstItem="PfQ-Db-XHp" firstAttribute="centerX" secondItem="Ekf-f8-I91" secondAttribute="centerX" id="tdv-fh-a2S"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="svS-es-Th2"/>
<exclude reference="3xY-wb-6Xh"/>
<exclude reference="7XR-L7-KFb"/>
<exclude reference="lcN-jE-NXC"/>
</mask>
</variation>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="Ekf-f8-I91" secondAttribute="trailing" id="BEc-gP-KWa"/>
<constraint firstItem="Ekf-f8-I91" firstAttribute="leading" secondItem="gVb-Q3-o7D" secondAttribute="leading" id="Q75-k7-9xD"/>
<constraint firstItem="Ekf-f8-I91" firstAttribute="top" secondItem="Rjf-Wp-6f5" secondAttribute="bottom" id="SAt-Ws-dX5"/>
<constraint firstItem="BHs-zd-nIc" firstAttribute="top" secondItem="Ekf-f8-I91" secondAttribute="bottom" id="Ya2-Xe-1d7"/>
</constraints>
</view>
<connections>
<outlet property="countDown" destination="NuH-am-xdY" id="hVj-19-7if"/>
<outlet property="gestureView" destination="Ekf-f8-I91" id="LKI-f7-re7"/>
<outlet property="subjectLabel" destination="PfQ-Db-XHp" id="6Vy-yK-hTw"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="cvD-By-SpU" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1011" y="155"/>
</scene>
</scenes>
</document>
22 changes: 22 additions & 0 deletions HeadsUpper/HeadsUpper/GuessViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// GuessViewController.h
// HeadsUpper
//
// Created by Bereket on 2/21/16.
// Copyright © 2016 Michael Kavouras. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface GuessViewController : UIViewController

@property (nonatomic) NSInteger timeCount;

@property (nonatomic) UIAlertView* GameOverAlertView;

@property (nonatomic) NSMutableArray* answersArray;




@end
Loading