Skip to content

Timer Project #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
Chrisrdavid7 wants to merge 86 commits into
base: master
Choose a base branch
from
Open

Timer Project #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
39a265f
First Commit, madeclasses
Chrisrdavid7 Aug 21, 2015
abd7ad5
First Stopwatch Storyboard
Chrisrdavid7 Aug 21, 2015
1ef0180
Added random photo for testing
fweathers Aug 21, 2015
e89364c
shawn was here
fweathers Aug 21, 2015
dec080f
added a picker view to timer
fweathers Aug 21, 2015
9c2d4ad
commiting
Chrisrdavid7 Aug 21, 2015
9509758
All Requirements for Stopwatch Complete
Chrisrdavid7 Aug 21, 2015
4d59c9a
added countdown timer
fweathers Aug 21, 2015
9b70d08
re-did code for the timer
fweathers Aug 22, 2015
d8a553e
pushing broken code
Chrisrdavid7 Aug 22, 2015
75978f5
implemented a picker into the timer, but timer counts down from time …
fweathers Aug 22, 2015
943a62d
All Basic Requirements Completed
Chrisrdavid7 Aug 22, 2015
cbbf11a
Did some fancy stuff with Timer
Chrisrdavid7 Aug 22, 2015
4f5fa35
Stopwatch On another Level
Chrisrdavid7 Aug 22, 2015
c404d76
added pause button to timer
fweathers Aug 22, 2015
77312c2
;q
fweathers Aug 22, 2015
d969b00
fixed the timer pause button
fweathers Aug 22, 2015
634cc20
Stop Watch Going Advanced
Chrisrdavid7 Aug 22, 2015
19c25ed
plz wprk
Chrisrdavid7 Aug 22, 2015
11dfdd7
End of Day Commit
Chrisrdavid7 Aug 22, 2015
ae24d81
LapTimer Finished
Chrisrdavid7 Aug 23, 2015
6097be3
Everything Working
Chrisrdavid7 Aug 23, 2015
f30265b
Added more stuff
Chrisrdavid7 Aug 23, 2015
e32e139
Bux Fixes
Chrisrdavid7 Aug 23, 2015
c625bd7
Added Icon for Timer
Chrisrdavid7 Aug 23, 2015
c05c1b7
Fixed Timer on StoryBoard
Chrisrdavid7 Aug 23, 2015
70db977
Implemented Restart Button on Timer
Chrisrdavid7 Aug 23, 2015
f9864fa
Edited Array, so most recent Lap comes out on top
Chrisrdavid7 Aug 23, 2015
ca8d389
Took out Syntasize, made everything properties. Also fixed the code i…
Chrisrdavid7 Aug 23, 2015
104f251
Added World Clock, which tells the current time
Chrisrdavid7 Aug 23, 2015
7a6038a
Added picker to world Clock
Chrisrdavid7 Aug 23, 2015
18ba55b
added a date countdown timer, need to add title label
fweathers Aug 23, 2015
52ece38
Navigation Controller Implementation
Chrisrdavid7 Aug 23, 2015
551e026
changed layout of date countdown
fweathers Aug 23, 2015
3d7945e
fixed conflict
fweathers Aug 23, 2015
9651beb
fixed conflicts
Chrisrdavid7 Aug 23, 2015
99c6c11
more conflicts
Chrisrdavid7 Aug 23, 2015
8279df4
Chris David was here
fweathers Aug 23, 2015
d5f9510
Finished all merge conflicts of Sunday August 23rd
fweathers Aug 23, 2015
cb92b15
changed countdown titleLabel to a text field
fweathers Aug 23, 2015
aad7c44
added a property to textedit
fweathers Aug 23, 2015
b65451d
added action, still working on it
fweathers Aug 23, 2015
e3b95ee
added label
fweathers Aug 23, 2015
7dc7c9e
fixed the countdown timer, now working
fweathers Aug 26, 2015
7002e0a
fixed bug with timer, now it will invalidate when it hits 00:00:00
fweathers Aug 26, 2015
3b2f521
commit
Chrisrdavid7 Aug 27, 2015
e1ff871
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
Chrisrdavid7 Aug 27, 2015
0699a69
Storyboard
Chrisrdavid7 Aug 27, 2015
2402d53
fixed errors with countdown
fweathers Aug 27, 2015
6665b3d
no changes
fweathers Aug 28, 2015
75a38d1
added class for preset timers and a navigation bar and tableview cont…
fweathers Aug 28, 2015
61f1509
git stuff
Chrisrdavid7 Aug 29, 2015
8845932
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
Chrisrdavid7 Aug 29, 2015
ded7896
Stuff
Chrisrdavid7 Aug 29, 2015
934d3df
fixed timer segue
fweathers Aug 29, 2015
5a19100
Commit Stuff
Chrisrdavid7 Aug 29, 2015
2b6cd63
added stuff
Chrisrdavid7 Aug 29, 2015
ab9cd54
added to preset timer. now has time property along with name. but sti…
fweathers Aug 29, 2015
4a3ecf8
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
fweathers Aug 29, 2015
74e5cf4
Fixed Stopwatch
Chrisrdavid7 Aug 30, 2015
d839cf6
offline work finially push
Chrisrdavid7 Sep 1, 2015
626b5af
working on timer
fweathers Sep 1, 2015
2daaecd
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
fweathers Sep 1, 2015
d6a678a
Please dont break anything Felicia
Chrisrdavid7 Sep 1, 2015
fb7768f
merge conflit resolved
fweathers Sep 1, 2015
72b6391
all fixed
Chrisrdavid7 Sep 1, 2015
dc25b48
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
Chrisrdavid7 Sep 1, 2015
2dd1606
Editied some Code from the Timer but it still doesnt work
Chrisrdavid7 Sep 1, 2015
1aa4e81
Removed the Code where it would center the image and give a black border
Chrisrdavid7 Sep 1, 2015
b133c6a
Music Added
Chrisrdavid7 Sep 1, 2015
795dfb1
changes made to timer, but still not working, going to start over
fweathers Sep 1, 2015
a054a5a
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
fweathers Sep 1, 2015
c9497e7
changes to timer, still not working, going to start over wth it
fweathers Sep 1, 2015
e1648fc
Music
Chrisrdavid7 Sep 1, 2015
87ca7e3
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
Chrisrdavid7 Sep 1, 2015
2b38de6
Stopwatch complete
Chrisrdavid7 Sep 1, 2015
6ba4f23
Added Mute button that doesnt work
Chrisrdavid7 Sep 1, 2015
07521ee
Added Audio
Chrisrdavid7 Sep 2, 2015
92dd70e
Added video
Chrisrdavid7 Sep 2, 2015
f3e3e0f
Editied Video
Chrisrdavid7 Sep 2, 2015
035fb21
partially fixed timer and in the process of adding an image to the Sp…
fweathers Sep 3, 2015
d12c335
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
fweathers Sep 3, 2015
daa86a0
merge
fweathers Sep 3, 2015
ed4b93f
commited'
Chrisrdavid7 Sep 3, 2015
62c3e47
Merge branch 'master' of https://github.com/Chrisrdavid7/unit-1-final…
Chrisrdavid7 Sep 3, 2015
38a1862
added background and customized timer and special timer
fweathers Sep 3, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Unit 1 Final Project

#Shawn was here
## Feature Requirements
2 primary screens

Expand Down
110 changes: 88 additions & 22 deletions Time/Time.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,24 @@
objects = {

/* Begin PBXBuildFile section */
003B48381B88CEC8004C430A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 003B48371B88CEC8004C430A /* Main.storyboard */; };
003B48411B8A322E004C430A /* SpecialEventViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 003B48401B8A322E004C430A /* SpecialEventViewController.m */; };
003B48431B8A4DE7004C430A /* Images .xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 003B48421B8A4DE7004C430A /* Images .xcassets */; };
009067FD1B8FF8E200BCBF71 /* PresetTimerTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 009067FC1B8FF8E200BCBF71 /* PresetTimerTableViewController.m */; };
009068381B92518900BCBF71 /* TimerData.m in Sources */ = {isa = PBXBuildFile; fileRef = 009068371B92518900BCBF71 /* TimerData.m */; };
45855BAE1B86A2A3008B61B8 /* StopwatchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45855BAD1B86A2A3008B61B8 /* StopwatchViewController.m */; };
45855BB11B86A2BB008B61B8 /* TimerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45855BB01B86A2BB008B61B8 /* TimerViewController.m */; };
45855BB31B88FB48008B61B8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45855BB21B88FB48008B61B8 /* QuartzCore.framework */; };
45C16ECD1B92334600C81079 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45C16ECC1B92334600C81079 /* MediaPlayer.framework */; };
45C600BD1B8A475C004C6714 /* WorldClockTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C600BC1B8A475C004C6714 /* WorldClockTableViewController.m */; };
45C9BBAE1B938D7A009001E2 /* WorldClockInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C9BBAD1B938D7A009001E2 /* WorldClockInfo.m */; };
45C9BBB11B938E28009001E2 /* NewWorldClockTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C9BBB01B938E28009001E2 /* NewWorldClockTableViewController.m */; };
45C9BBE51B95379D009001E2 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45C9BBE41B95379D009001E2 /* AVFoundation.framework */; };
45E331B41B968923005D6871 /* Wat.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 45E331B31B968923005D6871 /* Wat.mp3 */; };
45E331B61B969774005D6871 /* Video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 45E331B51B969774005D6871 /* Video.mp4 */; };
45E331F01B96A2BF005D6871 /* Video.mp4 in Sources */ = {isa = PBXBuildFile; fileRef = 45E331B51B969774005D6871 /* Video.mp4 */; };
8D05375E1B86687C00588318 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D05375D1B86687C00588318 /* main.m */; };
8D0537611B86687C00588318 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537601B86687C00588318 /* AppDelegate.m */; };
8D0537641B86687C00588318 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537631B86687C00588318 /* ViewController.m */; };
8D0537671B86687C00588318 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D0537651B86687C00588318 /* Main.storyboard */; };
8D0537691B86687C00588318 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D0537681B86687C00588318 /* Images.xcassets */; };
8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8D05376A1B86687C00588318 /* LaunchScreen.xib */; };
8D0537781B86687C00588318 /* TimeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D0537771B86687C00588318 /* TimeTests.m */; };
/* End PBXBuildFile section */
Expand All @@ -27,15 +40,34 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
003B48371B88CEC8004C430A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
003B483F1B8A322E004C430A /* SpecialEventViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialEventViewController.h; sourceTree = "<group>"; };
003B48401B8A322E004C430A /* SpecialEventViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpecialEventViewController.m; sourceTree = "<group>"; };
003B48421B8A4DE7004C430A /* Images .xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Images .xcassets"; sourceTree = "<group>"; };
009067F91B8FE7E700BCBF71 /* PresetTimerTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresetTimerTableViewController.h; sourceTree = "<group>"; };
009067FC1B8FF8E200BCBF71 /* PresetTimerTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PresetTimerTableViewController.m; sourceTree = "<group>"; };
009068361B9250F200BCBF71 /* TimerData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TimerData.h; sourceTree = "<group>"; };
009068371B92518900BCBF71 /* TimerData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimerData.m; sourceTree = "<group>"; };
45855BAC1B86A2A3008B61B8 /* StopwatchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StopwatchViewController.h; sourceTree = "<group>"; };
45855BAD1B86A2A3008B61B8 /* StopwatchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StopwatchViewController.m; sourceTree = "<group>"; };
45855BAF1B86A2BB008B61B8 /* TimerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerViewController.h; sourceTree = "<group>"; };
45855BB01B86A2BB008B61B8 /* TimerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimerViewController.m; sourceTree = "<group>"; };
45855BB21B88FB48008B61B8 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
45C16ECC1B92334600C81079 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
45C600BB1B8A475C004C6714 /* WorldClockTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorldClockTableViewController.h; sourceTree = "<group>"; };
45C600BC1B8A475C004C6714 /* WorldClockTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WorldClockTableViewController.m; sourceTree = "<group>"; };
45C9BBAC1B938D7A009001E2 /* WorldClockInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorldClockInfo.h; sourceTree = "<group>"; };
45C9BBAD1B938D7A009001E2 /* WorldClockInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WorldClockInfo.m; sourceTree = "<group>"; };
45C9BBAF1B938E28009001E2 /* NewWorldClockTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewWorldClockTableViewController.h; sourceTree = "<group>"; };
45C9BBB01B938E28009001E2 /* NewWorldClockTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewWorldClockTableViewController.m; sourceTree = "<group>"; };
45C9BBE41B95379D009001E2 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
45E331B31B968923005D6871 /* Wat.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Wat.mp3; path = Time/Wat.mp3; sourceTree = "<group>"; };
45E331B51B969774005D6871 /* Video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = Video.mp4; sourceTree = "<group>"; };
8D0537581B86687B00588318 /* Time.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Time.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D05375C1B86687B00588318 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8D05375D1B86687C00588318 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8D05375F1B86687C00588318 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8D0537601B86687C00588318 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8D0537621B86687C00588318 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
8D0537631B86687C00588318 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8D0537661B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8D0537681B86687C00588318 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
8D05376B1B86687C00588318 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
8D0537711B86687C00588318 /* TimeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TimeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8D0537761B86687C00588318 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -47,6 +79,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
45C9BBE51B95379D009001E2 /* AVFoundation.framework in Frameworks */,
45C16ECD1B92334600C81079 /* MediaPlayer.framework in Frameworks */,
45855BB31B88FB48008B61B8 /* QuartzCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -60,10 +95,23 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
45C9BBED1B954B6A009001E2 /* Sounds */ = {
isa = PBXGroup;
children = (
45E331B51B969774005D6871 /* Video.mp4 */,
45E331B31B968923005D6871 /* Wat.mp3 */,
);
name = Sounds;
sourceTree = "<group>";
};
8D05374F1B86687B00588318 = {
isa = PBXGroup;
children = (
45C9BBE41B95379D009001E2 /* AVFoundation.framework */,
45C16ECC1B92334600C81079 /* MediaPlayer.framework */,
45855BB21B88FB48008B61B8 /* QuartzCore.framework */,
8D05375A1B86687B00588318 /* Time */,
45C9BBED1B954B6A009001E2 /* Sounds */,
8D0537741B86687C00588318 /* TimeTests */,
8D0537591B86687B00588318 /* Products */,
);
Expand All @@ -83,10 +131,24 @@
children = (
8D05375F1B86687C00588318 /* AppDelegate.h */,
8D0537601B86687C00588318 /* AppDelegate.m */,
8D0537621B86687C00588318 /* ViewController.h */,
8D0537631B86687C00588318 /* ViewController.m */,
8D0537651B86687C00588318 /* Main.storyboard */,
8D0537681B86687C00588318 /* Images.xcassets */,
45855BAC1B86A2A3008B61B8 /* StopwatchViewController.h */,
45855BAD1B86A2A3008B61B8 /* StopwatchViewController.m */,
45855BAF1B86A2BB008B61B8 /* TimerViewController.h */,
45855BB01B86A2BB008B61B8 /* TimerViewController.m */,
009067F91B8FE7E700BCBF71 /* PresetTimerTableViewController.h */,
009067FC1B8FF8E200BCBF71 /* PresetTimerTableViewController.m */,
009068361B9250F200BCBF71 /* TimerData.h */,
009068371B92518900BCBF71 /* TimerData.m */,
003B483F1B8A322E004C430A /* SpecialEventViewController.h */,
003B48401B8A322E004C430A /* SpecialEventViewController.m */,
45C9BBAC1B938D7A009001E2 /* WorldClockInfo.h */,
45C9BBAD1B938D7A009001E2 /* WorldClockInfo.m */,
45C9BBAF1B938E28009001E2 /* NewWorldClockTableViewController.h */,
45C9BBB01B938E28009001E2 /* NewWorldClockTableViewController.m */,
45C600BB1B8A475C004C6714 /* WorldClockTableViewController.h */,
45C600BC1B8A475C004C6714 /* WorldClockTableViewController.m */,
003B48371B88CEC8004C430A /* Main.storyboard */,
003B48421B8A4DE7004C430A /* Images .xcassets */,
8D05376A1B86687C00588318 /* LaunchScreen.xib */,
8D05375B1B86687B00588318 /* Supporting Files */,
);
Expand Down Expand Up @@ -199,9 +261,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D0537671B86687C00588318 /* Main.storyboard in Resources */,
45E331B61B969774005D6871 /* Video.mp4 in Resources */,
003B48381B88CEC8004C430A /* Main.storyboard in Resources */,
45E331B41B968923005D6871 /* Wat.mp3 in Resources */,
8D05376C1B86687C00588318 /* LaunchScreen.xib in Resources */,
8D0537691B86687C00588318 /* Images.xcassets in Resources */,
003B48431B8A4DE7004C430A /* Images .xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -219,9 +283,17 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D0537641B86687C00588318 /* ViewController.m in Sources */,
45E331F01B96A2BF005D6871 /* Video.mp4 in Sources */,
45C9BBB11B938E28009001E2 /* NewWorldClockTableViewController.m in Sources */,
45855BB11B86A2BB008B61B8 /* TimerViewController.m in Sources */,
8D0537611B86687C00588318 /* AppDelegate.m in Sources */,
009067FD1B8FF8E200BCBF71 /* PresetTimerTableViewController.m in Sources */,
009068381B92518900BCBF71 /* TimerData.m in Sources */,
003B48411B8A322E004C430A /* SpecialEventViewController.m in Sources */,
8D05375E1B86687C00588318 /* main.m in Sources */,
45C600BD1B8A475C004C6714 /* WorldClockTableViewController.m in Sources */,
45855BAE1B86A2A3008B61B8 /* StopwatchViewController.m in Sources */,
45C9BBAE1B938D7A009001E2 /* WorldClockInfo.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -244,14 +316,6 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
8D0537651B86687C00588318 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
8D0537661B86687C00588318 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
8D05376A1B86687C00588318 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -418,6 +482,7 @@
8D05377D1B86687C00588318 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8D05377E1B86687C00588318 /* Build configuration list for PBXNativeTarget "TimeTests" */ = {
isa = XCConfigurationList;
Expand All @@ -426,6 +491,7 @@
8D0537801B86687C00588318 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
2 changes: 1 addition & 1 deletion Time/Time.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.

Loading