-
Notifications
You must be signed in to change notification settings - Fork 26
OptionSelector_Justine #7
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
JustineKay
wants to merge
12
commits into
accesscode-2-2:master
Choose a base branch
from
JustineKay: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
12 commits
Select commit
Hold shift + click to select a range
87d80b9
Began to enter data
1332905
detail list view and checkmarks are working
1bc143b
detail text on rootViewController is working :)
4c50ac1
restructured data, added color feature, color feature needs just a li…
2f0321b
Color feature is fully functioning :)
e6d1f52
added description comment to CQCategory class model
18826ae
added description commetn for the CQShadesData class
148eb8e
updated shades of red with CQShades class method
c8613f3
updated shades of yellow with the new CQShades class method
5f5468f
updated shades of blue with the new CQShades class method
f89603a
added constants for shade keys, simpilified the ListTableViewControll…
757b170
added NSUserDefaults
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,102 @@ | ||
| <?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="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="yHh-TO-TBS"> | ||
| <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"> | ||
| <!--Root View Controller--> | ||
| <scene sceneID="A5M-Xt-RcU"> | ||
| <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="ies-nT-E3N" customClass="CategoriesRootViewTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Y4C-In-wmf"> | ||
| <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" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ColorThesaurusIdentifier" textLabel="yIU-Ez-kN7" detailTextLabel="Tyy-Lo-ptm" rowHeight="200" style="IBUITableViewCellStyleValue1" id="HNi-SL-atG"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HNi-SL-atG" id="cQL-7x-0vF"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yIU-Ez-kN7"> | ||
| <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="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tyy-Lo-ptm"> | ||
| <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="84C-4i-w7q" kind="show" id="Ct4-bZ-ume"/> | ||
| </connections> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <connections> | ||
| <outlet property="dataSource" destination="ies-nT-E3N" id="JCe-6Y-gZL"/> | ||
| <outlet property="delegate" destination="ies-nT-E3N" id="Ji2-ZL-rfI"/> | ||
| </connections> | ||
| </tableView> | ||
| <navigationItem key="navigationItem" title="Root View Controller" id="MEk-cr-JB2"/> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="02s-6d-1KN" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="712" y="460"/> | ||
| </scene> | ||
| <!--List Table View Controller--> | ||
| <scene sceneID="iM8-ep-Y7g"> | ||
| <objects> | ||
| <tableViewController id="84C-4i-w7q" customClass="ListTableViewController" sceneMemberID="viewController"> | ||
| <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="lFC-5Z-xJ3"> | ||
| <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="none" indentationWidth="10" reuseIdentifier="ListOfShadesCellIdentifier" textLabel="1P7-tJ-8Tf" style="IBUITableViewCellStyleDefault" id="Cy9-53-DOP"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Cy9-53-DOP" id="o93-PZ-D7O"> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1P7-tJ-8Tf"> | ||
| <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> | ||
| </subviews> | ||
| </tableViewCellContentView> | ||
| </tableViewCell> | ||
| </prototypes> | ||
| <connections> | ||
| <outlet property="dataSource" destination="84C-4i-w7q" id="mPx-6B-HEX"/> | ||
| <outlet property="delegate" destination="84C-4i-w7q" id="sof-RL-0pz"/> | ||
| </connections> | ||
| </tableView> | ||
| </tableViewController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="l0x-3o-Y3F" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="1396" y="460"/> | ||
| </scene> | ||
| <!--Navigation Controller--> | ||
| <scene sceneID="TMN-kr-guX"> | ||
| <objects> | ||
| <navigationController id="yHh-TO-TBS" sceneMemberID="viewController"> | ||
| <navigationBar key="navigationBar" contentMode="scaleToFill" id="sFn-nT-BgJ"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| </navigationBar> | ||
| <connections> | ||
| <segue destination="ies-nT-E3N" kind="relationship" relationship="rootViewController" id="YtN-Z8-mIm"/> | ||
| </connections> | ||
| </navigationController> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="Wmq-jl-5ae" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| </objects> | ||
| <point key="canvasLocation" x="-108" y="460"/> | ||
| </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,26 @@ | ||
| // | ||
| // CQCategory.h | ||
| // OptionSelector | ||
| // | ||
| // Created by Justine Gartner on 8/11/15. | ||
| // Copyright (c) 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import <UIKit/UIKit.h> | ||
|
|
||
| //Model class for a category and it's related items/options. Every category has an array of options to choose from. Every array of options has a corresponding array of shade colors. Selected options and selected shade colors are selected by user. | ||
| @interface CQCategory : NSObject | ||
|
|
||
| @property (nonatomic) NSString *name; | ||
| @property (nonatomic) NSString *detailTitle; | ||
| @property (nonatomic) NSArray *options; | ||
| @property (nonatomic) NSArray *shadeColors; | ||
| @property (nonatomic) NSString *selectedOption; | ||
| @property (nonatomic) UIColor *selectedShadeColor; | ||
|
|
||
| -(void)saveSelection; | ||
|
|
||
| -(void)loadDefaults; | ||
|
|
||
| @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,47 @@ | ||
| // | ||
| // CQCategory.m | ||
| // OptionSelector | ||
| // | ||
| // Created by Justine Gartner on 8/11/15. | ||
| // Copyright (c) 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #define SelectedOptionKey @"SelectedOptionName" | ||
| #define SelectedColorKey @"SelectedColor" | ||
|
|
||
| #import "CQCategory.h" | ||
|
|
||
| @implementation CQCategory | ||
|
|
||
| -(void)saveSelection{ | ||
|
|
||
| //archive the UIColor into NSData | ||
| NSData *colorData = [NSKeyedArchiver archivedDataWithRootObject:self.selectedShadeColor]; | ||
|
|
||
| //create a dictionary with the selectedOption and selectedShadeColor | ||
| NSDictionary *data = @{SelectedOptionKey : self.selectedOption, | ||
| SelectedColorKey : colorData | ||
| }; | ||
| //store the dictionary in NSUserDefaults with the key: self.name | ||
| [[NSUserDefaults standardUserDefaults] setObject:data forKey:self.name]; | ||
|
|
||
| } | ||
|
|
||
| -(void)loadDefaults{ | ||
|
|
||
| //load dictionary from NSUserDefaluts for the key: self.name | ||
| NSDictionary *data = [[NSUserDefaults standardUserDefaults] objectForKey:self.name]; | ||
|
|
||
| //access the alue for the key color (NSData) | ||
| NSData *colorData = data[SelectedColorKey]; | ||
|
|
||
| //convert the color data (NSData) to a color object (UIColor) | ||
| UIColor *color = [NSKeyedUnarchiver unarchiveObjectWithData:colorData]; | ||
|
|
||
| if (data != nil) { | ||
| self.selectedOption = data[SelectedOptionKey]; | ||
| self.selectedShadeColor = color; | ||
| } | ||
| } | ||
|
|
||
| @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,22 @@ | ||
| // | ||
| // CQShadesData.h | ||
| // OptionSelector | ||
| // | ||
| // Created by Justine Gartner on 8/13/15. | ||
| // Copyright (c) 2015 Mike Kavouras. All rights reserved. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import "CQCategory.h" | ||
|
|
||
|
|
||
| //Initializes data for categories of shades from CQCategory class | ||
| @interface CQShadesData : NSObject | ||
|
|
||
| @property (nonatomic) CQCategory *red; | ||
| @property (nonatomic) CQCategory *blue; | ||
| @property (nonatomic) CQCategory *yellow; | ||
|
|
||
| -(void)initializeData; | ||
|
|
||
| @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.
It's good practice to include at least one comment for each class describing what it does or what data it stores (if it's just a data storage class). Even if it seems obvious to you now, it might not in a month (and it might not to your colleagues).
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.
Ok! 👍