-
Notifications
You must be signed in to change notification settings - Fork 26
final #32
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.
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
bblanco1
wants to merge
1
commit into
accesscode-2-2:master
Choose a base branch
from
bblanco1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
final #32
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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="vXZ-lx-hvc"> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8164.2" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="FCm-3J-HUR"> | ||
| <dependencies> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8135.1"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--View Controller--> | ||
| <scene sceneID="ufC-wZ-h7g"> | ||
| <!--Animal Classes--> | ||
| <scene sceneID="APr-9z-Hzb"> | ||
| <objects> | ||
| <viewController id="vXZ-lx-hvc" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController"> | ||
| <layoutGuides> | ||
| <viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/> | ||
| <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/> | ||
| </layoutGuides> | ||
| <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS"> | ||
| <tableViewController id="Pmn-Ti-CfK" customClass="MainTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Hrl-dF-fSm"> | ||
| <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | ||
| </view> | ||
| </viewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/> | ||
| <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
| <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| <prototypes> | ||
| <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="reuseIdentifier" textLabel="fbS-qB-CnW" detailTextLabel="QIl-OE-wf8" style="IBUITableViewCellStyleValue1" id="SsL-jD-UaP"> | ||
| <rect key="frame" x="0.0" y="86" width="600" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SsL-jD-UaP" id="U3q-6E-BzO"> | ||
| <rect key="frame" x="0.0" y="0.0" width="567" height="43"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fbS-qB-CnW"> | ||
| <rect key="frame" x="15" y="12" width="32" height="20"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <fontDescription key="fontDescription" type="system" pointSize="16"/> | ||
| <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QIl-OE-wf8"> | ||
| <rect key="frame" x="523" y="12" width="42" height="20"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <fontDescription key="fontDescription" type="system" pointSize="16"/> | ||
| <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| </subviews> | ||
| </tableViewCellContentView> | ||
| <connections> | ||
| <segue destination="axi-RA-tIO" kind="show" id="0iv-NX-zUQ"/> | ||
| </connections> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <sections/> | ||
| <connections> | ||
| <outlet property="dataSource" destination="Pmn-Ti-CfK" id="0St-GO-avg"/> | ||
| <outlet property="delegate" destination="Pmn-Ti-CfK" id="lrS-hO-48n"/> | ||
| </connections> | ||
| </tableView> | ||
| <navigationItem key="navigationItem" title="Animal Classes" id="6CK-Yc-p5h"/> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="2Uj-7N-TfQ" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="2193" y="-229"/> | ||
| </scene> | ||
| <!--Animal Species --> | ||
| <scene sceneID="lfE-MJ-Qth"> | ||
| <objects> | ||
| <tableViewController id="axi-RA-tIO" customClass="DetailTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="kqZ-Av-63v"> | ||
| <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="reuseIdentifierDetail" textLabel="6g2-nk-ljI" style="IBUITableViewCellStyleDefault" id="Qtq-iP-STx"> | ||
| <rect key="frame" x="0.0" y="86" width="600" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qtq-iP-STx" id="hg0-03-QFi"> | ||
| <rect key="frame" x="0.0" y="0.0" width="600" height="43"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6g2-nk-ljI"> | ||
| <rect key="frame" x="15" y="0.0" width="570" height="43"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <fontDescription key="fontDescription" type="system" pointSize="16"/> | ||
| <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| </subviews> | ||
| </tableViewCellContentView> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <connections> | ||
| <outlet property="dataSource" destination="axi-RA-tIO" id="vbL-9y-BPq"/> | ||
| <outlet property="delegate" destination="axi-RA-tIO" id="HuR-lA-tFv"/> | ||
| </connections> | ||
| </tableView> | ||
| <navigationItem key="navigationItem" title="Animal Species " id="EwX-HG-pHt"/> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="jF9-Bd-lzC" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="2844" y="-229"/> | ||
| </scene> | ||
| <!--Navigation Controller--> | ||
| <scene sceneID="Drd-rW-hyY"> | ||
| <objects> | ||
| <navigationController automaticallyAdjustsScrollViewInsets="NO" id="FCm-3J-HUR" sceneMemberID="viewController"> | ||
| <toolbarItems/> | ||
| <navigationBar key="navigationBar" contentMode="scaleToFill" id="LSU-z7-ths"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| </navigationBar> | ||
| <nil name="viewControllers"/> | ||
| <connections> | ||
| <segue destination="Pmn-Ti-CfK" kind="relationship" relationship="rootViewController" id="M6H-h4-Iwh"/> | ||
| </connections> | ||
| </navigationController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="lTi-gY-bxW" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="1381" y="-229"/> | ||
| </scene> | ||
| </scenes> | ||
| </document> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // | ||
| // CQCategory.h | ||
| // OptionSelector | ||
| // | ||
| // Created by Brian Blanco on 8/14/15. | ||
| // Copyright © 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @interface CQCategory : NSObject | ||
|
|
||
| @property(strong, nonatomic) NSString *name; | ||
| @property(strong, nonatomic) NSArray *options; | ||
| @property(strong, nonatomic) NSString *selction; | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // CQCategory.m | ||
| // OptionSelector | ||
| // | ||
| // Created by Brian Blanco on 8/14/15. | ||
| // Copyright © 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import "CQCategory.h" | ||
|
|
||
| @implementation CQCategory | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // SubTableViewController.h | ||
| // OptionSelector | ||
| // | ||
| // Created by Brian Blanco on 8/14/15. | ||
| // Copyright © 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import <UIKit/UIKit.h> | ||
| #import "CQCategory.h" | ||
|
|
||
| @interface DetailTableViewController : UITableViewController | ||
|
|
||
| @property(nonatomic)CQCategory *category; | ||
|
|
||
| @end | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Style: there should be a space between the property attributes and the type
@property(nonatomic) CQCategory *category; // ^