Skip to content

Homework Completed #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.

Sign up for GitHub

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
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Homework Completed #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e210c38
First commit
cdolm92 Aug 14, 2015
2d3beef
Added category names
cdolm92 Aug 14, 2015
ffd64de
Added segue with no data
cdolm92 Aug 14, 2015
bdef92d
added some data
cdolm92 Aug 15, 2015
57abe7b
Added options data. segue still not working
cdolm92 Aug 15, 2015
aa09d5c
Homework done. comments next
cdolm92 Aug 16, 2015
beed04c
Added detail text label that displays selection
cdolm92 Aug 16, 2015
cf05c07
Added color to cells and some emoticons to navbar title
cdolm92 Aug 16, 2015
f2e595a
Added background music ^-^
cdolm92 Aug 17, 2015
12e571d
Added pastry images to cells :D
cdolm92 Aug 17, 2015
6450df6
Better organized
cdolm92 Aug 17, 2015
b4c1c93
Fixed some errors
cdolm92 Aug 18, 2015
5f49353
changed nav text colors
cdolm92 Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 46 additions & 22 deletions OptionSelector.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@
/* Begin PBXBuildFile section */
8DECE7921B78082B0064D760 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7911B78082B0064D760 /* main.m */; };
8DECE7951B78082B0064D760 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7941B78082B0064D760 /* AppDelegate.m */; };
8DECE7981B78082B0064D760 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7971B78082B0064D760 /* ViewController.m */; };
8DECE79B1B78082B0064D760 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE7991B78082B0064D760 /* Main.storyboard */; };
8DECE79D1B78082B0064D760 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79C1B78082B0064D760 /* Images.xcassets */; };
8DECE7A01B78082B0064D760 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8DECE79E1B78082B0064D760 /* LaunchScreen.xib */; };
8DECE7AC1B78082B0064D760 /* OptionSelectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */; };
F72F82EF1B8273E100715C10 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F72F82EE1B8273E100715C10 /* Images.xcassets */; };
F72F82F11B82A77F00715C10 /* pastryland.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = F72F82F01B82A77F00715C10 /* pastryland.mp3 */; };
F72F82F21B82A77F00715C10 /* pastryland.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = F72F82F01B82A77F00715C10 /* pastryland.mp3 */; };
F7D4F5D81B7D0EEE00BC6BA4 /* PastriesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D4F5D71B7D0EEE00BC6BA4 /* PastriesTableViewController.m */; };
F7D4F5DB1B7D190600BC6BA4 /* PastryCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D4F5DA1B7D190600BC6BA4 /* PastryCategories.m */; };
F7D4F6161B7E8AF300BC6BA4 /* POTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D4F6151B7E8AF300BC6BA4 /* POTableViewController.m */; };
F7D4F6191B7E8F0200BC6BA4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7D4F6171B7E8F0200BC6BA4 /* Main.storyboard */; };
F7D4F64D1B824B4800BC6BA4 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7D4F64C1B824B4800BC6BA4 /* AVFoundation.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -32,21 +37,28 @@
8DECE7911B78082B0064D760 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8DECE7931B78082B0064D760 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8DECE7941B78082B0064D760 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8DECE7961B78082B0064D760 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
8DECE7971B78082B0064D760 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8DECE79A1B78082B0064D760 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8DECE79C1B78082B0064D760 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
8DECE79F1B78082B0064D760 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
8DECE7A51B78082B0064D760 /* OptionSelectorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OptionSelectorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8DECE7AA1B78082B0064D760 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8DECE7AB1B78082B0064D760 /* OptionSelectorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OptionSelectorTests.m; sourceTree = "<group>"; };
F72F82EE1B8273E100715C10 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
F72F82F01B82A77F00715C10 /* pastryland.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = pastryland.mp3; sourceTree = "<group>"; };
F7D4F5D61B7D0EEE00BC6BA4 /* PastriesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PastriesTableViewController.h; sourceTree = "<group>"; };
F7D4F5D71B7D0EEE00BC6BA4 /* PastriesTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PastriesTableViewController.m; sourceTree = "<group>"; };
F7D4F5D91B7D190600BC6BA4 /* PastryCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PastryCategories.h; sourceTree = "<group>"; };
F7D4F5DA1B7D190600BC6BA4 /* PastryCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PastryCategories.m; sourceTree = "<group>"; };
F7D4F6141B7E8AF300BC6BA4 /* POTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = POTableViewController.h; sourceTree = "<group>"; };
F7D4F6151B7E8AF300BC6BA4 /* POTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POTableViewController.m; sourceTree = "<group>"; };
F7D4F6181B7E8F0200BC6BA4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
F7D4F64C1B824B4800BC6BA4 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
8DECE7891B78082B0064D760 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F7D4F64D1B824B4800BC6BA4 /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,6 +75,7 @@
8DECE7831B78082B0064D760 = {
isa = PBXGroup;
children = (
F7D4F64C1B824B4800BC6BA4 /* AVFoundation.framework */,
8DECE78E1B78082B0064D760 /* OptionSelector */,
8DECE7A81B78082B0064D760 /* OptionSelectorTests */,
8DECE78D1B78082B0064D760 /* Products */,
Expand All @@ -83,10 +96,14 @@
children = (
8DECE7931B78082B0064D760 /* AppDelegate.h */,
8DECE7941B78082B0064D760 /* AppDelegate.m */,
8DECE7961B78082B0064D760 /* ViewController.h */,
8DECE7971B78082B0064D760 /* ViewController.m */,
8DECE7991B78082B0064D760 /* Main.storyboard */,
8DECE79C1B78082B0064D760 /* Images.xcassets */,
F7D4F5D91B7D190600BC6BA4 /* PastryCategories.h */,
F7D4F5DA1B7D190600BC6BA4 /* PastryCategories.m */,
F7D4F5D61B7D0EEE00BC6BA4 /* PastriesTableViewController.h */,
F7D4F5D71B7D0EEE00BC6BA4 /* PastriesTableViewController.m */,
F7D4F6141B7E8AF300BC6BA4 /* POTableViewController.h */,
F7D4F6151B7E8AF300BC6BA4 /* POTableViewController.m */,
F7D4F6171B7E8F0200BC6BA4 /* Main.storyboard */,
F72F82EE1B8273E100715C10 /* Images.xcassets */,
8DECE79E1B78082B0064D760 /* LaunchScreen.xib */,
8DECE78F1B78082B0064D760 /* Supporting Files */,
);
Expand All @@ -96,6 +113,7 @@
8DECE78F1B78082B0064D760 /* Supporting Files */ = {
isa = PBXGroup;
children = (
F72F82F01B82A77F00715C10 /* pastryland.mp3 */,
8DECE7901B78082B0064D760 /* Info.plist */,
8DECE7911B78082B0064D760 /* main.m */,
);
Expand Down Expand Up @@ -199,16 +217,18 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8DECE79B1B78082B0064D760 /* Main.storyboard in Resources */,
F7D4F6191B7E8F0200BC6BA4 /* Main.storyboard in Resources */,
F72F82EF1B8273E100715C10 /* Images.xcassets in Resources */,
F72F82F11B82A77F00715C10 /* pastryland.mp3 in Resources */,
8DECE7A01B78082B0064D760 /* LaunchScreen.xib in Resources */,
8DECE79D1B78082B0064D760 /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
8DECE7A31B78082B0064D760 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F72F82F21B82A77F00715C10 /* pastryland.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -219,9 +239,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8DECE7981B78082B0064D760 /* ViewController.m in Sources */,
8DECE7951B78082B0064D760 /* AppDelegate.m in Sources */,
F7D4F5D81B7D0EEE00BC6BA4 /* PastriesTableViewController.m in Sources */,
F7D4F5DB1B7D190600BC6BA4 /* PastryCategories.m in Sources */,
8DECE7921B78082B0064D760 /* main.m in Sources */,
F7D4F6161B7E8AF300BC6BA4 /* POTableViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -244,20 +266,20 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
8DECE7991B78082B0064D760 /* Main.storyboard */ = {
8DECE79E1B78082B0064D760 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
8DECE79A1B78082B0064D760 /* Base */,
8DECE79F1B78082B0064D760 /* Base */,
);
name = Main.storyboard;
name = LaunchScreen.xib;
sourceTree = "<group>";
};
8DECE79E1B78082B0064D760 /* LaunchScreen.xib */ = {
F7D4F6171B7E8F0200BC6BA4 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
8DECE79F1B78082B0064D760 /* Base */,
F7D4F6181B7E8F0200BC6BA4 /* Base */,
);
name = LaunchScreen.xib;
name = Main.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
Expand Down Expand Up @@ -348,7 +370,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = OptionSelector/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -359,7 +381,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = OptionSelector/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down Expand Up @@ -418,6 +440,7 @@
8DECE7B11B78082B0064D760 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8DECE7B21B78082B0064D760 /* Build configuration list for PBXNativeTarget "OptionSelectorTests" */ = {
isa = XCConfigurationList;
Expand All @@ -426,6 +449,7 @@
8DECE7B41B78082B0064D760 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
7 changes: 6 additions & 1 deletion OptionSelector/AppDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
//

#import <UIKit/UIKit.h>
#import <AVFoundation/AVFoundation.h>

@interface AppDelegate : UIResponder <UIApplicationDelegate>

@interface AppDelegate :UIResponder <UIApplicationDelegate, AVAudioPlayerDelegate> {

AVAudioPlayer *pastryMusic;
}

@property (strong, nonatomic) UIWindow *window;

Expand Down
8 changes: 7 additions & 1 deletion OptionSelector/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ @implementation AppDelegate


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.

NSString *music = [[NSBundle mainBundle]pathForResource:@"pastryland" ofType:@"mp3"];
pastryMusic = [[AVAudioPlayer alloc] initWithContentsOfURL: [NSURL fileURLWithPath:music] error:NULL];
pastryMusic.delegate = self;
pastryMusic.numberOfLoops = -1;
[pastryMusic play];

return YES;
}

Expand Down
5 changes: 3 additions & 2 deletions OptionSelector/Base.lproj/LaunchScreen.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand Down
Loading