Skip to content

Modified Hunt & Clue View Controllers #12

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

Modified Hunt & Clue View Controllers #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a53cea
Modified Hunt & Clue View Controllers
Mar 25, 2014
8a92701
Removed MapView
Mar 25, 2014
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
10 changes: 0 additions & 10 deletions DLScavenger.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
24A80FCC18E20EE300EFADDC /* DLClueViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24A80FCA18E20EE300EFADDC /* DLClueViewController.xib */; };
24CF092218E0B06D00509876 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24CF092118E0B06D00509876 /* MapKit.framework */; };
24CF092418E0B07500509876 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24CF092318E0B07500509876 /* CoreLocation.framework */; };
24CF092818E0B1EA00509876 /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24CF092618E0B1EA00509876 /* MapViewController.m */; };
24CF092918E0B1EA00509876 /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24CF092718E0B1EA00509876 /* MapViewController.xib */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -77,9 +75,6 @@
24A80FCA18E20EE300EFADDC /* DLClueViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DLClueViewController.xib; sourceTree = "<group>"; };
24CF092118E0B06D00509876 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
24CF092318E0B07500509876 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
24CF092518E0B1EA00509876 /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = "<group>"; };
24CF092618E0B1EA00509876 /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = "<group>"; };
24CF092718E0B1EA00509876 /* MapViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MapViewController.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -160,9 +155,6 @@
children = (
249F6E0918E0AC4100FA1F76 /* DLAppDelegate.h */,
249F6E0A18E0AC4100FA1F76 /* DLAppDelegate.m */,
24CF092518E0B1EA00509876 /* MapViewController.h */,
24CF092618E0B1EA00509876 /* MapViewController.m */,
24CF092718E0B1EA00509876 /* MapViewController.xib */,
243A048118E0B13E00F78CE8 /* Models */,
24A80FB618E0AE5D00EFADDC /* DLHuntViewController.h */,
24A80FB718E0AE5D00EFADDC /* DLHuntViewController.m */,
Expand Down Expand Up @@ -286,7 +278,6 @@
24A80FBA18E0AE5D00EFADDC /* DLHuntViewController.xib in Resources */,
24A80FCC18E20EE300EFADDC /* DLClueViewController.xib in Resources */,
249F6E0518E0AC4100FA1F76 /* InfoPlist.strings in Resources */,
24CF092918E0B1EA00509876 /* MapViewController.xib in Resources */,
249F6E0D18E0AC4100FA1F76 /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -309,7 +300,6 @@
24A80FC718E209BC00EFADDC /* DLHunt.m in Sources */,
24A80FCB18E20EE300EFADDC /* DLClueViewController.m in Sources */,
240ED51618E2047400B5C1A9 /* DLAppDelegate.m in Sources */,
24CF092818E0B1EA00509876 /* MapViewController.m in Sources */,
243A048418E0B18700F78CE8 /* DLClue.m in Sources */,
24A80FB918E0AE5D00EFADDC /* DLHuntViewController.m in Sources */,
24A80FBF18E0B87700EFADDC /* Reachability.m in Sources */,
Expand Down
2 changes: 2 additions & 0 deletions DLScavenger/DLAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
self.window.backgroundColor = [UIColor whiteColor];
self.huntViewController = [[DLHuntViewController alloc] initWithNibName:@"DLHuntViewController" bundle:nil];
self.window.rootViewController = self.huntViewController;

[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
[self.window makeKeyAndVisible];
return YES;
}
Expand Down
88 changes: 54 additions & 34 deletions DLScavenger/DLClueViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,19 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1234" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XNP-Vj-CiB">
<rect key="frame" x="278" y="35" width="42" height="21"/>
<rect key="frame" x="258" y="35" width="42" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.67436119679999995" green="1" blue="0.82953323400000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Score" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ikv-SY-7jk">
<rect key="frame" x="280" y="20" width="31" height="21"/>
<rect key="frame" x="260" y="20" width="31" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="10"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uTd-so-tx4">
<rect key="frame" x="20" y="333" width="280" height="215"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt.</string>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<imageView userInteractionEnabled="NO" alpha="0.90000000000000002" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2dB-Tc-6yX">
<rect key="frame" x="40" y="216" width="240" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
Expand All @@ -67,46 +59,74 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<imageView userInteractionEnabled="NO" alpha="0.89999997615814209" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dvb-SV-gbr">
<rect key="frame" x="16" y="289" width="140" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g4N-PX-HKy">
<rect key="frame" x="16" y="289" width="140" height="36"/>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EMT-Xh-3bH">
<rect key="frame" x="20" y="26" width="68" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Image Clue">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<state key="normal" title="Clues List">
<color key="titleColor" red="0.70980393890000004" green="0.98823535439999999" blue="0.87058830259999997" alpha="1" colorSpace="deviceRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<imageView userInteractionEnabled="NO" alpha="0.89999997615814209" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ab3-X9-3P1">
<rect key="frame" x="164" y="289" width="140" height="36"/>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uTd-so-tx4">
<rect key="frame" x="20" y="333" width="280" height="136"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</string>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gBr-9Y-e6o">
<rect key="frame" x="0.0" y="279" width="320" height="190"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRd-Oy-DI7">
<rect key="frame" x="164" y="289" width="140" height="36"/>
<segmentedControl opaque="NO" alpha="0.90000000000000002" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="qPC-2N-dnr">
<rect key="frame" x="20" y="297" width="280" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<state key="normal" title="Audio Clue">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<segments>
<segment title="Image Clue"/>
<segment title="Text Clue"/>
<segment title="Audio Clue"/>
</segments>
</segmentedControl>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
</view>
<view contentMode="scaleToFill" id="vRa-nI-BdW">
<rect key="frame" x="0.0" y="0.0" width="320" height="82"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="5" minValue="0.0" maxValue="10" translatesAutoresizingMaskIntoConstraints="NO" id="9Z1-16-d6a">
<rect key="frame" x="38" y="49" width="244" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</slider>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A2i-Qr-EWZ">
<rect key="frame" x="138" y="8" width="44" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<state key="normal" title="Play">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EMT-Xh-3bH">
<rect key="frame" x="13" y="26" width="68" height="30"/>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BdH-F7-SF4">
<rect key="frame" x="40" y="7" width="48" height="33"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Clues List">
<color key="titleColor" red="0.70980393890000004" green="0.98823535439999999" blue="0.87058830259999997" alpha="1" colorSpace="deviceRGB"/>
<state key="normal" title="Pause">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zyo-e1-Frl">
<rect key="frame" x="236" y="7" width="44" height="33"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Stop">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
</objects>
</document>
Loading