Skip to content

J2branch #1

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

J2branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ba7fa6
Committing initial J2 files
awadams Jul 3, 2018
6c92242
s
rustykatz Jul 4, 2018
c803a77
Merge branch 'j2branch' of https://github.com/royliver44/CMPT276 into…
rustykatz Jul 4, 2018
2a5f3f9
s
rustykatz Jul 4, 2018
ba29108
Meal scheduling, new edits
awadams Jul 4, 2018
0a90233
J2 (Andy) and Tom's Music combined into single project
awadams Jul 4, 2018
fa7feb4
Added write-to-XML functionality for saving scheduled meals
awadams Jul 5, 2018
b6c83e4
Meal Profile updated
awadams Jul 6, 2018
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
77 changes: 54 additions & 23 deletions FoodForThought.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
objects = {

/* Begin PBXBuildFile section */
6D8D3F9A20E78CE000899583 /* October.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6D8D3F9920E78CE000899583 /* October.mp3 */; };
6D8D3F9C20E78CE700899583 /* The Truth That You Leave.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6D8D3F9B20E78CE700899583 /* The Truth That You Leave.mp3 */; };
6D8D3F9E20E78CED00899583 /* Kiss The Rain.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6D8D3F9D20E78CED00899583 /* Kiss The Rain.mp3 */; };
6D8D3FA020E7969F00899583 /* MusicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D8D3F9F20E7969F00899583 /* MusicController.swift */; };
DF47C74C20E69A3E002F1D8A /* MealTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF47C74B20E69A3E002F1D8A /* MealTableViewCell.swift */; };
DF47C74E20E69F8A002F1D8A /* ScheduledMeal.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF47C74D20E69F8A002F1D8A /* ScheduledMeal.swift */; };
DF86C5E720ED5FA5001F3778 /* MusicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF86C5E620ED5FA4001F3778 /* MusicController.swift */; };
DFA39A1620E80AAE00E54064 /* MealTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFA39A1520E80AAE00E54064 /* MealTableViewController.swift */; };
DFE0DACC20E56628000D63E1 /* MealProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFE0DACB20E56628000D63E1 /* MealProfileViewController.swift */; };
DFECD16D20ED70D000515451 /* Kiss The Rain.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DFECD16920ED70D000515451 /* Kiss The Rain.mp3 */; };
DFECD16E20ED70D000515451 /* m.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DFECD16A20ED70D000515451 /* m.mp3 */; };
DFECD16F20ED70D000515451 /* October.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DFECD16B20ED70D000515451 /* October.mp3 */; };
DFECD17020ED70D000515451 /* The Truth That You Leave.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DFECD16C20ED70D000515451 /* The Truth That You Leave.mp3 */; };
DFECD17220ED732300515451 /* mealProfile.xml in Resources */ = {isa = PBXBuildFile; fileRef = DFECD17120ED732300515451 /* mealProfile.xml */; };
F632C3F820E48DD0005D5805 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F632C3F720E48DD0005D5805 /* AppDelegate.swift */; };
F632C3FA20E48DD0005D5805 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F632C3F920E48DD0005D5805 /* FirstViewController.swift */; };
F632C3FC20E48DD0005D5805 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F632C3FB20E48DD0005D5805 /* SecondViewController.swift */; };
Expand Down Expand Up @@ -39,10 +45,16 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
6D8D3F9920E78CE000899583 /* October.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = October.mp3; sourceTree = "<group>"; };
6D8D3F9B20E78CE700899583 /* The Truth That You Leave.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "The Truth That You Leave.mp3"; sourceTree = "<group>"; };
6D8D3F9D20E78CED00899583 /* Kiss The Rain.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "Kiss The Rain.mp3"; sourceTree = "<group>"; };
6D8D3F9F20E7969F00899583 /* MusicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicController.swift; sourceTree = "<group>"; };
DF47C74B20E69A3E002F1D8A /* MealTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealTableViewCell.swift; sourceTree = "<group>"; };
DF47C74D20E69F8A002F1D8A /* ScheduledMeal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduledMeal.swift; sourceTree = "<group>"; };
DF86C5E620ED5FA4001F3778 /* MusicController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MusicController.swift; sourceTree = "<group>"; };
DFA39A1520E80AAE00E54064 /* MealTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealTableViewController.swift; sourceTree = "<group>"; };
DFE0DACB20E56628000D63E1 /* MealProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MealProfileViewController.swift; sourceTree = "<group>"; };
DFECD16920ED70D000515451 /* Kiss The Rain.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "Kiss The Rain.mp3"; sourceTree = "<group>"; };
DFECD16A20ED70D000515451 /* m.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = m.mp3; sourceTree = "<group>"; };
DFECD16B20ED70D000515451 /* October.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = October.mp3; sourceTree = "<group>"; };
DFECD16C20ED70D000515451 /* The Truth That You Leave.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = "The Truth That You Leave.mp3"; sourceTree = "<group>"; };
DFECD17120ED732300515451 /* mealProfile.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mealProfile.xml; sourceTree = "<group>"; };
F632C3F420E48DD0005D5805 /* FoodForThought.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FoodForThought.app; sourceTree = BUILT_PRODUCTS_DIR; };
F632C3F720E48DD0005D5805 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F632C3F920E48DD0005D5805 /* FirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -84,12 +96,13 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
6D8D3F9820E78CCB00899583 /* Music */ = {
DFECD16820ED70D000515451 /* Music */ = {
isa = PBXGroup;
children = (
6D8D3F9920E78CE000899583 /* October.mp3 */,
6D8D3F9B20E78CE700899583 /* The Truth That You Leave.mp3 */,
6D8D3F9D20E78CED00899583 /* Kiss The Rain.mp3 */,
DFECD16920ED70D000515451 /* Kiss The Rain.mp3 */,
DFECD16A20ED70D000515451 /* m.mp3 */,
DFECD16B20ED70D000515451 /* October.mp3 */,
DFECD16C20ED70D000515451 /* The Truth That You Leave.mp3 */,
);
path = Music;
sourceTree = "<group>";
Expand Down Expand Up @@ -117,15 +130,20 @@
F632C3F620E48DD0005D5805 /* FoodForThought */ = {
isa = PBXGroup;
children = (
DFECD17120ED732300515451 /* mealProfile.xml */,
DFECD16820ED70D000515451 /* Music */,
F632C3F720E48DD0005D5805 /* AppDelegate.swift */,
F632C3F920E48DD0005D5805 /* FirstViewController.swift */,
F632C3FB20E48DD0005D5805 /* SecondViewController.swift */,
F632C3FD20E48DD0005D5805 /* Main.storyboard */,
6D8D3F9F20E7969F00899583 /* MusicController.swift */,
DF47C74B20E69A3E002F1D8A /* MealTableViewCell.swift */,
F632C40020E48DD0005D5805 /* Assets.xcassets */,
F632C40220E48DD0005D5805 /* LaunchScreen.storyboard */,
F632C40520E48DD0005D5805 /* Info.plist */,
6D8D3F9820E78CCB00899583 /* Music */,
DFE0DACB20E56628000D63E1 /* MealProfileViewController.swift */,
DFA39A1520E80AAE00E54064 /* MealTableViewController.swift */,
DF47C74D20E69F8A002F1D8A /* ScheduledMeal.swift */,
DF86C5E620ED5FA4001F3778 /* MusicController.swift */,
);
path = FoodForThought;
sourceTree = "<group>";
Expand Down Expand Up @@ -216,12 +234,8 @@
TargetAttributes = {
F632C3F320E48DD0005D5805 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0920;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
};
};
};
F632C40920E48DD0005D5805 = {
CreatedOnToolsVersion = 9.2;
Expand Down Expand Up @@ -260,12 +274,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DFECD16E20ED70D000515451 /* m.mp3 in Resources */,
F632C40420E48DD0005D5805 /* LaunchScreen.storyboard in Resources */,
DFECD16F20ED70D000515451 /* October.mp3 in Resources */,
F632C40120E48DD0005D5805 /* Assets.xcassets in Resources */,
DFECD16D20ED70D000515451 /* Kiss The Rain.mp3 in Resources */,
DFECD17020ED70D000515451 /* The Truth That You Leave.mp3 in Resources */,
DFECD17220ED732300515451 /* mealProfile.xml in Resources */,
F632C3FF20E48DD0005D5805 /* Main.storyboard in Resources */,
6D8D3F9A20E78CE000899583 /* October.mp3 in Resources */,
6D8D3F9E20E78CED00899583 /* Kiss The Rain.mp3 in Resources */,
6D8D3F9C20E78CE700899583 /* The Truth That You Leave.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -290,9 +306,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DF47C74E20E69F8A002F1D8A /* ScheduledMeal.swift in Sources */,
F632C3FC20E48DD0005D5805 /* SecondViewController.swift in Sources */,
6D8D3FA020E7969F00899583 /* MusicController.swift in Sources */,
DFE0DACC20E56628000D63E1 /* MealProfileViewController.swift in Sources */,
F632C3F820E48DD0005D5805 /* AppDelegate.swift in Sources */,
DF47C74C20E69A3E002F1D8A /* MealTableViewCell.swift in Sources */,
DF86C5E720ED5FA5001F3778 /* MusicController.swift in Sources */,
DFA39A1620E80AAE00E54064 /* MealTableViewController.swift in Sources */,
F632C3FA20E48DD0005D5805 /* FirstViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -459,11 +479,17 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = DB3D83U263;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = FoodForThought/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = edu.self.FoodForThought;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -473,11 +499,16 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = DB3D83U263;
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = FoodForThought/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = edu.self.FoodForThought;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
2 changes: 1 addition & 1 deletion FoodForThought.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions FoodForThought.xcodeproj/project.xcworkspace/contents.xcworkspacedata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:FoodForThought.xcodeproj">
</FileRef>
</Workspace>
5 changes: 1 addition & 4 deletions ...ace/xcshareddata/IDEWorkspaceChecks.plist → ...xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
<dict/>
</plist>
5 changes: 5 additions & 0 deletions FoodForThought.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?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/>
</plist>
Binary file added ...odeproj/project.xcworkspace/xcuserdata/awadams.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions ...xcodeproj/project.xcworkspace/xcuserdata/awadams.xcuserdatad/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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>BuildLocationStyle</key>
<string>UseAppPreferences</string>
<key>CustomBuildLocationType</key>
<string>RelativeToDerivedData</string>
<key>DerivedDataLocationStyle</key>
<string>Default</string>
<key>EnabledFullIndexStoreVisibility</key>
<false/>
<key>IssueFilterStyle</key>
<string>ShowActiveSchemeOnly</string>
<key>LiveSourceIssuesEnabled</key>
<true/>
</dict>
</plist>
18 changes: 18 additions & 0 deletions ...eproj/project.xcworkspace/xcuserdata/awadams.xcuserdatad/WorkspaceSettings.xcsettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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>BuildLocationStyle</key>
<string>UseAppPreferences</string>
<key>CustomBuildLocationType</key>
<string>RelativeToDerivedData</string>
<key>DerivedDataLocationStyle</key>
<string>Default</string>
<key>EnabledFullIndexStoreVisibility</key>
<false/>
<key>IssueFilterStyle</key>
<string>ShowActiveSchemeOnly</string>
<key>LiveSourceIssuesEnabled</key>
<true/>
</dict>
</plist>
Empty file modified ...deproj/project.xcworkspace/xcuserdata/jehrenho.xcuserdatad/UserInterfaceState.xcuserstate
100644 → 100755
View file
Open in desktop
Empty file.
Binary file removed ...deproj/project.xcworkspace/xcuserdata/tomzhang.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
23 changes: 23 additions & 0 deletions ...Thought.xcodeproj/xcuserdata/awadams.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "FoodForThought/ScheduledMealControl.swift"
timestampString = "552082784.763815"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "29"
endingLineNumber = "29"
landmarkName = "displayNoMealsScheduled()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
0 ...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
File renamed without changes.
Empty file modified FoodForThought.xcodeproj/xcuserdata/jehrenho.xcuserdatad/xcschemes/xcschememanagement.plist
100644 → 100755
View file
Open in desktop
Empty file.
Binary file added FoodForThought/.DS_Store
View file
Open in desktop
Binary file not shown.
Empty file modified FoodForThought/AppDelegate.swift
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FoodForThought/Assets.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FoodForThought/Assets.xcassets/first.imageset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FoodForThought/Assets.xcassets/first.imageset/first.pdf
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FoodForThought/Assets.xcassets/second.imageset/Contents.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified FoodForThought/Assets.xcassets/second.imageset/second.pdf
100644 → 100755
View file
Open in desktop
Empty file.
Binary file added FoodForThought/Base.lproj/.DS_Store
View file
Open in desktop
Binary file not shown.
Empty file modified FoodForThought/Base.lproj/LaunchScreen.storyboard
100644 → 100755
View file
Open in desktop
Empty file.
Loading