-
Notifications
You must be signed in to change notification settings - Fork 27
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
Charles K. (Option Selector HW) #8
Open
charleshkang
wants to merge
10
commits into
accesscode-2-2:master
Choose a base branch
from
charleshkang: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
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
21aa88c
set up inital outline
824c898
further initial setup
2b59445
restarted project, added better organization
ccadaa2
more changes
497eb56
still need to work on storyboard, can't get instancetype method in ca…
f6dea71
init method still not working
c5763ff
working on storyboard
37244e1
got delegate to work
e3e8955
finished requirements
82ba548
added some comments
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 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 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,94 @@ | ||
| <?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="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="cej-h9-GJU"> | ||
| <dependencies> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--View Controller--> | ||
| <scene sceneID="ufC-wZ-h7g"> | ||
| <!--Navigation Controller--> | ||
| <scene sceneID="PKd-7R-xYX"> | ||
| <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"> | ||
| <navigationController id="cej-h9-GJU" sceneMemberID="viewController"> | ||
| <navigationBar key="navigationBar" contentMode="scaleToFill" id="6zd-SY-VDD"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| </navigationBar> | ||
| <connections> | ||
| <segue destination="eRL-9i-623" kind="relationship" relationship="rootViewController" id="3Qf-4U-AId"/> | ||
| </connections> | ||
| </navigationController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="flH-fF-5Tj" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="874" y="-136"/> | ||
| </scene> | ||
| <!--Categories--> | ||
| <scene sceneID="6CT-k5-oZM"> | ||
| <objects> | ||
| <tableViewController title="Categories" id="eRL-9i-623" customClass="CategoryTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="UhW-Jc-0Gp"> | ||
| <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 contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="CategoryCellIdentifier" textLabel="qBb-vt-Ew5" detailTextLabel="x44-LT-tEp" style="IBUITableViewCellStyleValue1" id="YyX-qp-3eR"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YyX-qp-3eR" id="hjA-5G-gVP"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qBb-vt-Ew5"> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <fontDescription key="fontDescription" type="system" pointSize="16"/> | ||
| <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="x44-LT-tEp"> | ||
| <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="r6H-SQ-Jgw" kind="show" id="s0a-qO-fQv"/> | ||
| </connections> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <connections> | ||
| <outlet property="dataSource" destination="eRL-9i-623" id="OJp-7W-Peq"/> | ||
| <outlet property="delegate" destination="eRL-9i-623" id="Ptd-xI-4NI"/> | ||
| </connections> | ||
| </tableView> | ||
| <navigationItem key="navigationItem" id="A2O-WV-ZXW"/> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="6CJ-Q3-Fgc" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="1646" y="-136"/> | ||
| </scene> | ||
| <!--Option Selection Table View Controller--> | ||
| <scene sceneID="caH-I9-BqS"> | ||
| <objects> | ||
| <tableViewController id="r6H-SQ-Jgw" customClass="OptionSelectionTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="nfv-4x-YxJ"> | ||
| <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 contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cellChoiceIdentifier" id="rJO-XE-csA"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rJO-XE-csA" id="YcI-k1-3DJ"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| </tableViewCellContentView> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <connections> | ||
| <outlet property="dataSource" destination="r6H-SQ-Jgw" id="f73-LJ-sae"/> | ||
| <outlet property="delegate" destination="r6H-SQ-Jgw" id="wxP-Yy-MhG"/> | ||
| </connections> | ||
| </tableView> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="v1g-rp-d5x" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="2366" y="-136"/> | ||
| </scene> | ||
| </scenes> | ||
| </document> |
This file contains 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 @@ | ||
| // | ||
| // Categories.h | ||
| // OptionSelector | ||
| // | ||
| // Created by Charles Kang on 8/11/15. | ||
| // Copyright (c) 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @interface Categories : NSObject | ||
|
|
||
| @property (nonatomic) NSString *name; | ||
| @property (nonatomic) NSArray *choices; | ||
| @property (nonatomic) NSString *selection; | ||
|
|
||
| @end | ||
This file contains 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 @@ | ||
| // | ||
| // Categories.m | ||
| // OptionSelector | ||
| // | ||
| // Created by Charles Kang on 8/11/15. | ||
| // Copyright (c) 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import "Categories.h" | ||
|
|
||
| @implementation Categories | ||
|
|
||
| @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.
Classes nearly always should have singular names. This is a single category, not a set of categories.
(Even classes that hold multiple things are generally singular; "Set", "List", "Deck", etc.)