Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
BIN ios/.DS_Store
Binary file not shown.
View
22 ios/Camp Joy Outdoors.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ 09939F3D1812F73D0043AFCD /* glossary_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 09939F3C1812F73D0043AFCD /* glossary_iPhone.storyboard */; };
+ 09939F401812F7F80043AFCD /* CJOGlossaryDefinitionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 09939F3F1812F7F80043AFCD /* CJOGlossaryDefinitionViewController.m */; };
42405B6A18121F7800292674 /* CJOQuestion.m in Sources */ = {isa = PBXBuildFile; fileRef = 42405B6918121F7800292674 /* CJOQuestion.m */; };
42405B6D18121F8500292674 /* CJOTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 42405B6C18121F8500292674 /* CJOTree.m */; };
42405B7018121F9600292674 /* CJOGlossaryTerm.m in Sources */ = {isa = PBXBuildFile; fileRef = 42405B6F18121F9600292674 /* CJOGlossaryTerm.m */; };
@@ -56,6 +58,9 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 09939F3C1812F73D0043AFCD /* glossary_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = glossary_iPhone.storyboard; sourceTree = "<group>"; };
+ 09939F3E1812F7F80043AFCD /* CJOGlossaryDefinitionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJOGlossaryDefinitionViewController.h; sourceTree = "<group>"; };
+ 09939F3F1812F7F80043AFCD /* CJOGlossaryDefinitionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJOGlossaryDefinitionViewController.m; sourceTree = "<group>"; };
42405B6818121F7800292674 /* CJOQuestion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJOQuestion.h; sourceTree = "<group>"; };
42405B6918121F7800292674 /* CJOQuestion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJOQuestion.m; sourceTree = "<group>"; };
42405B6B18121F8500292674 /* CJOTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJOTree.h; sourceTree = "<group>"; };
@@ -141,6 +146,18 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 09939F3B1812F6BC0043AFCD /* glossary */ = {
+ isa = PBXGroup;
+ children = (
+ 09939F3C1812F73D0043AFCD /* glossary_iPhone.storyboard */,
+ 4250A8FD1812141D00F2F282 /* CJOGlossaryViewController.h */,
+ 4250A8FE1812141D00F2F282 /* CJOGlossaryViewController.m */,
+ 09939F3E1812F7F80043AFCD /* CJOGlossaryDefinitionViewController.h */,
+ 09939F3F1812F7F80043AFCD /* CJOGlossaryDefinitionViewController.m */,
+ );
+ name = glossary;
+ sourceTree = "<group>";
+ };
42405B6718121F4400292674 /* Model */ = {
isa = PBXGroup;
children = (
@@ -193,8 +210,6 @@
4252C3A8180F8888001F86F5 /* Main_iPad.storyboard */,
4252C3AB180F8888001F86F5 /* CJOHomeViewController.h */,
4252C3AC180F8888001F86F5 /* CJOHomeViewController.m */,
- 4250A8FD1812141D00F2F282 /* CJOGlossaryViewController.h */,
- 4250A8FE1812141D00F2F282 /* CJOGlossaryViewController.m */,
4250A9001812143E00F2F282 /* CJOAboutUsViewController.h */,
4250A9011812143E00F2F282 /* CJOAboutUsViewController.m */,
);
@@ -217,6 +232,7 @@
4250A916181220D900F2F282 /* Views */ = {
isa = PBXGroup;
children = (
+ 09939F3B1812F6BC0043AFCD /* glossary */,
4250A90A1812169900F2F282 /* Main */,
4250A9091812159900F2F282 /* Identify */,
);
@@ -403,6 +419,7 @@
4250A9061812156700F2F282 /* Identify_iPhone.storyboard in Resources */,
4252C3AA180F8888001F86F5 /* Main_iPad.storyboard in Resources */,
4252C3B2180F8888001F86F5 /* Images.xcassets in Resources */,
+ 09939F3D1812F73D0043AFCD /* glossary_iPhone.storyboard in Resources */,
4252C3A7180F8888001F86F5 /* Main_iPhone.storyboard in Resources */,
4252C39E180F8888001F86F5 /* InfoPlist.strings in Resources */,
);
@@ -474,6 +491,7 @@
42EA2F521812C139007BB93B /* UIView+FrameSize.m in Sources */,
4250A91C1812326700F2F282 /* CJOAnswerCell.m in Sources */,
4250A8FF1812141D00F2F282 /* CJOGlossaryViewController.m in Sources */,
+ 09939F401812F7F80043AFCD /* CJOGlossaryDefinitionViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
41 ios/Camp Joy Outdoors.xcworkspace/xcshareddata/Camp Joy Outdoors.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDESourceControlProjectFavoriteDictionaryKey</key>
+ <false/>
+ <key>IDESourceControlProjectIdentifier</key>
+ <string>38DB815B-28DD-46D4-9E16-7F60F56D16C3</string>
+ <key>IDESourceControlProjectName</key>
+ <string>Camp Joy Outdoors</string>
+ <key>IDESourceControlProjectOriginsDictionary</key>
+ <dict>
+ <key>FFB113F0-CA28-47D8-B5A6-315AD0B38A3E</key>
+ <string>https://github.com/btelintelo/campjoy.git</string>
+ </dict>
+ <key>IDESourceControlProjectPath</key>
+ <string>ios/Camp Joy Outdoors.xcworkspace</string>
+ <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+ <dict>
+ <key>FFB113F0-CA28-47D8-B5A6-315AD0B38A3E</key>
+ <string>../..</string>
+ </dict>
+ <key>IDESourceControlProjectURL</key>
+ <string>https://github.com/btelintelo/campjoy.git</string>
+ <key>IDESourceControlProjectVersion</key>
+ <integer>110</integer>
+ <key>IDESourceControlProjectWCCIdentifier</key>
+ <string>FFB113F0-CA28-47D8-B5A6-315AD0B38A3E</string>
+ <key>IDESourceControlProjectWCConfigurations</key>
+ <array>
+ <dict>
+ <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+ <string>public.vcs.git</string>
+ <key>IDESourceControlWCCIdentifierKey</key>
+ <string>FFB113F0-CA28-47D8-B5A6-315AD0B38A3E</string>
+ <key>IDESourceControlWCCName</key>
+ <string>campjoy</string>
+ </dict>
+ </array>
+</dict>
+</plist>
View
14 ios/Camp Joy Outdoors/CJOGlossaryDefinitionViewController.h
@@ -0,0 +1,14 @@
+//
+// CJOGlossaryDefinitionViewController.h
+// Camp Joy Outdoors
+//
+// Created by Samuel Corder on 10/19/13.
+// Copyright (c) 2013 Camp Joy. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CJOGlossaryDefinitionViewController : UIViewController
+@property (copy, nonatomic) NSString *word;
+
+@end
View
38 ios/Camp Joy Outdoors/CJOGlossaryDefinitionViewController.m
@@ -0,0 +1,38 @@
+//
+// CJOGlossaryDefinitionViewController.m
+// Camp Joy Outdoors
+//
+// Created by Samuel Corder on 10/19/13.
+// Copyright (c) 2013 Camp Joy. All rights reserved.
+//
+
+#import "CJOGlossaryDefinitionViewController.h"
+
+@interface CJOGlossaryDefinitionViewController ()
+
+@end
+
+@implementation CJOGlossaryDefinitionViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ // Custom initialization
+ }
+ return self;
+}
+
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning
+{
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+@end
View
63 ios/Camp Joy Outdoors/glossary_iPhone.storyboard
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="1fh-HY-3Bj">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+ </dependencies>
+ <scenes>
+ <!--Table View Controller-->
+ <scene sceneID="Nmu-26-vTB">
+ <objects>
+ <tableViewController id="1fh-HY-3Bj" sceneMemberID="viewController">
+ <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="mfs-3l-7wW">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <prototypes>
+ <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="6fX-mA-OVv">
+ <rect key="frame" x="0.0" y="22" width="320" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6fX-mA-OVv" id="cwS-SX-cyu">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableViewCellContentView>
+ </tableViewCell>
+ </prototypes>
+ <connections>
+ <outlet property="dataSource" destination="1fh-HY-3Bj" id="KRH-aD-jIq"/>
+ <outlet property="delegate" destination="1fh-HY-3Bj" id="ovw-8k-2Yz"/>
+ </connections>
+ </tableView>
+ <connections>
+ <segue destination="HIq-Yg-oHl" kind="push" identifier="definition" id="SOq-j3-Ylc"/>
+ </connections>
+ </tableViewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="EmL-os-Ljo" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="48" y="118"/>
+ </scene>
+ <!--Glossary Definition View Controller-->
+ <scene sceneID="Lnu-9d-4cC">
+ <objects>
+ <viewController id="HIq-Yg-oHl" customClass="CJOGlossaryDefinitionViewController" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="TRP-5W-pwr"/>
+ <viewControllerLayoutGuide type="bottom" id="cd4-9f-jgA"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="qlK-Pe-E7A">
+ <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ </view>
+ <navigationItem key="navigationItem" id="Eg3-2Q-aQb"/>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="yjB-wP-w8b" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="425" y="118"/>
+ </scene>
+ </scenes>
+ <simulatedMetricsContainer key="defaultSimulatedMetrics">
+ <simulatedStatusBarMetrics key="statusBar"/>
+ <simulatedOrientationMetrics key="orientation"/>
+ <simulatedScreenMetrics key="destination" type="retina4"/>
+ </simulatedMetricsContainer>
+</document>

No commit comments for this range

Something went wrong with that request. Please try again.