Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents adff097 + febc12f commit b5aedd6a6f9ed4f28fc8971f19ed8533e34ff4c0 @samus samus committed Oct 19, 2013
View
Binary file not shown.
@@ -45,6 +45,7 @@
4252C3BB180F8888001F86F5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4252C397180F8888001F86F5 /* UIKit.framework */; };
4252C3C3180F8888001F86F5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4252C3C1180F8888001F86F5 /* InfoPlist.strings */; };
4252C3C5180F8888001F86F5 /* Camp_Joy_OutdoorsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4252C3C4180F8888001F86F5 /* Camp_Joy_OutdoorsTests.m */; };
+ 4290D7F01813293E00B8057A /* dichotomy in Resources */ = {isa = PBXBuildFile; fileRef = 4290D7EF1813293E00B8057A /* dichotomy */; };
42EA2F521812C139007BB93B /* UIView+FrameSize.m in Sources */ = {isa = PBXBuildFile; fileRef = 42EA2F511812C139007BB93B /* UIView+FrameSize.m */; };
5506317E969D4A2890B04CD5 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D17A9345361743DFB82FFB8A /* libPods.a */; };
FA0B2BDF1812F22800FF21A7 /* trees in Resources */ = {isa = PBXBuildFile; fileRef = FA0B2BDE1812F22800FF21A7 /* trees */; };
@@ -123,6 +124,7 @@
4252C3C2180F8888001F86F5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4252C3C4180F8888001F86F5 /* Camp_Joy_OutdoorsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Camp_Joy_OutdoorsTests.m; sourceTree = "<group>"; };
4290D7EA1812F5AC00B8057A /* CJOConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJOConstants.h; sourceTree = "<group>"; };
+ 4290D7EF1813293E00B8057A /* dichotomy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dichotomy; path = ../../data/images/dichotomy; sourceTree = "<group>"; };
42EA2F501812C139007BB93B /* UIView+FrameSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+FrameSize.h"; sourceTree = "<group>"; };
42EA2F511812C139007BB93B /* UIView+FrameSize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+FrameSize.m"; sourceTree = "<group>"; };
73C95832BE124778979EB613 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; };
@@ -444,6 +446,7 @@
09939F3D1812F73D0043AFCD /* glossary_iPhone.storyboard in Resources */,
FA4638B518131C2A007F62DD /* maps in Resources */,
4252C3A7180F8888001F86F5 /* Main_iPhone.storyboard in Resources */,
+ 4290D7F01813293E00B8057A /* dichotomy in Resources */,
4252C39E180F8888001F86F5 /* InfoPlist.strings in Resources */,
09939F4218132B300043AFCD /* glossary in Resources */,
42405B821812F90700292674 /* campjoy.jpg in Resources */,
@@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Wi-B1-fbz">
+ <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Wi-B1-fbz">
<rect key="frame" x="12" y="313" width="280" height="177"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -122,7 +122,7 @@ -(UIImage *) imageForIndexPath:(NSIndexPath *) indexPath {
else if (indexPath.row == 1) {
imageIndex = @"b";
}
- NSString * imageName = [NSString stringWithFormat:@"images/dichotomy/%@%@", self.question.id, imageIndex];
+ NSString * imageName = [NSString stringWithFormat:@"dichotomy/%@%@", self.question.id, imageIndex];
return [UIImage imageNamed:imageName];
}
@@ -19,7 +19,7 @@
</objects>
<point key="canvasLocation" x="-185" y="-24"/>
</scene>
- <!--Question View Controller-->
+ <!--Question View Controller - Please choose-->
<scene sceneID="Afw-4g-Vvz">
<objects>
<tableViewController id="rn2-3u-e2c" customClass="CJOQuestionViewController" sceneMemberID="viewController">
@@ -86,7 +86,7 @@
<outlet property="delegate" destination="rn2-3u-e2c" id="RIE-I8-8Re"/>
</connections>
</tableView>
- <navigationItem key="navigationItem" id="LcP-fU-63t">
+ <navigationItem key="navigationItem" title="Please choose" id="LcP-fU-63t">
<barButtonItem key="rightBarButtonItem" title="Restart" id="9Ha-Gc-lmm">
<connections>
<action selector="restartQuestions:" destination="rn2-3u-e2c" id="3Za-eV-1PG"/>

0 comments on commit b5aedd6

Please sign in to comment.