Skip to content
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

Submission. Might add more things. #3

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
11ded5a
Converted to Swift
JovannyEspinal Aug 21, 2015
3405dc7
Stopwatch Interface
JovannyEspinal Aug 21, 2015
b555ff3
Icons + Stopwatch Interface
JovannyEspinal Aug 21, 2015
45822ef
Start and Stop function working
JovannyEspinal Aug 22, 2015
f563132
Reset function added
JovannyEspinal Aug 22, 2015
5b30dff
Semi working Lap function. Not capturing the difference in times; cap…
JovannyEspinal Aug 22, 2015
e35ce89
Final stopwatch commit
JovannyEspinal Aug 22, 2015
148403a
Final stopwatch commit
JovannyEspinal Aug 22, 2015
63d748f
1st
Aug 22, 2015
993eb32
Stopwatch with updated comments
JovannyEspinal Aug 22, 2015
d7f4c58
1
Aug 22, 2015
ddf8400
Merge branch 'master' of https://github.com/JovannyEspinal/unit-1-fin…
Aug 22, 2015
3c38ccf
Re-push of Stopwatch
JovannyEspinal Aug 22, 2015
2901491
t
Aug 22, 2015
0706801
updated variable names
Aug 22, 2015
a305ae1
fixed second interval
Aug 22, 2015
15d17f4
timer demo
Aug 22, 2015
6e34ba9
timer logic v1
Aug 22, 2015
435547d
fixed print
Aug 22, 2015
be588c9
Touched storyboard by accident
JovannyEspinal Aug 22, 2015
4971119
Storyboard updated
JovannyEspinal Aug 22, 2015
086863f
Stopwatch/Timer clock draft
JovannyEspinal Aug 22, 2015
73eda19
Fixed Table Cell Detail View
JovannyEspinal Aug 22, 2015
32d5ea4
Custom table cell label displaying timer
JovannyEspinal Aug 22, 2015
c2cd82b
Timer in table cell with button udpate --Need to add start/cancel fea…
JovannyEspinal Aug 23, 2015
3fa5ee8
p
Aug 23, 2015
36752f1
v
Aug 23, 2015
4421db0
opened it
Aug 23, 2015
a8295f1
FIxed time duration
JovannyEspinal Aug 23, 2015
095b9fc
test push
JovannyEspinal Aug 23, 2015
a942d13
t
Aug 23, 2015
6dff383
we
Aug 23, 2015
400f358
Final Stopwatch
JovannyEspinal Aug 23, 2015
f3931fd
Committed and added
JovannyEspinal Aug 25, 2015
4d6b673
Committed and added files images
JovannyEspinal Aug 25, 2015
d8df5bf
Progress Bar Working
JovannyEspinal Aug 26, 2015
1a2e21e
Changed images and Progress Bar Work
JovannyEspinal Aug 26, 2015
d525bc3
storyboard fix
Derek316x Aug 28, 2015
d7e8404
Fixed Timer Buttons and Progress Bar
JovannyEspinal Aug 28, 2015
02051a1
Refactored some code in Timer View Controller
JovannyEspinal Aug 28, 2015
687f1f0
Added alarm and Alert Controller
JovannyEspinal Aug 29, 2015
ac05ad5
stringFromTimeInterval
Derek316x Aug 29, 2015
f1b7c03
v
Derek316x Aug 29, 2015
6e76788
alert
Derek316x Aug 29, 2015
bca8192
Added Timer Name's to Table View Cells
JovannyEspinal Aug 29, 2015
05f72e9
stringfromtimeinterval fixed
Derek316x Aug 29, 2015
d9ee107
Commit
JovannyEspinal Aug 29, 2015
4c3d4de
k
Derek316x Aug 29, 2015
586248a
r
Derek316x Aug 29, 2015
27b4fab
Storyboard fix
JovannyEspinal Aug 29, 2015
c7cb1ca
qr
Derek316x Aug 29, 2015
9db0a40
b
Derek316x Aug 29, 2015
9fbb537
f
Derek316x Aug 29, 2015
d5c46e1
Fixed alarm
JovannyEspinal Aug 29, 2015
c446498
Fixed transition between Add Timer VC and Timer VC
JovannyEspinal Aug 29, 2015
0665cd4
nstimeinterval extension done
Derek316x Aug 29, 2015
f19686e
Eh
JovannyEspinal Aug 29, 2015
1bb6e7c
Fixed Add Timer VC to pass data successfully
JovannyEspinal Aug 29, 2015
fcda3e4
n
Derek316x Aug 29, 2015
ff64861
Fixed Stuff
JovannyEspinal Aug 29, 2015
8900528
g
Derek316x Aug 30, 2015
426551f
countdown done
Derek316x Aug 30, 2015
c89a9dd
all 3 in tab bar controller
Derek316x Aug 30, 2015
8ea86e7
dsf
Derek316x Aug 30, 2015
e80f223
y
Derek316x Aug 30, 2015
d92bcd5
Storyboard edit
JovannyEspinal Aug 30, 2015
7208385
i
Derek316x Aug 30, 2015
7c2159b
d
Derek316x Aug 30, 2015
2fc3267
s
Derek316x Aug 30, 2015
0e58c85
Added Quick Timer interface
JovannyEspinal Aug 30, 2015
1a5251f
Quick Timer Interface and new assets
JovannyEspinal Aug 30, 2015
4a653ab
Storyboard edit
JovannyEspinal Aug 30, 2015
006acb1
z
Derek316x Aug 30, 2015
52c2be9
j
Derek316x Aug 30, 2015
217d48e
Test
JovannyEspinal Aug 30, 2015
03f7762
b
Derek316x Aug 30, 2015
0e42586
updated didSelectRow method in countdown
Derek316x Aug 31, 2015
62dfe31
h
Derek316x Aug 31, 2015
82a4669
when error
Derek316x Aug 31, 2015
c5e1569
u
Derek316x Aug 31, 2015
310606e
e
Derek316x Aug 31, 2015
0b96c40
Fixed stringByAppendingPath error.
JovannyEspinal Aug 31, 2015
c827d1a
Quick Timer Interface Added
JovannyEspinal Aug 31, 2015
5d6a058
Quick Timer Feature Added
JovannyEspinal Aug 31, 2015
fd3c6a9
Updated UI. Project completion pending review.
JovannyEspinal Sep 1, 2015
33c9321
Removed unneccessary files
JovannyEspinal Sep 1, 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
Prev Previous commit
Next Next commit
f
Derek316x committed Aug 29, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 9fbb5370069432e7ed9a5e9129c4bf13f8c8d153
12 changes: 10 additions & 2 deletions Timer Demo/Timer Demo/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
<!--Countdown-->
<scene sceneID="CfX-jj-hrz">
<objects>
<placeholder placeholderIdentifier="IBFirstResponder" id="kgY-j4-gD9" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewController id="fv3-ti-Iiy" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="UBU-oO-YmV"/>
@@ -37,13 +38,20 @@
<view key="view" contentMode="scaleToFill" id="Q6g-GI-DQd">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ukV-0y-Gjb">
<rect key="frame" x="279" y="33" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" title="Countdown" id="p1p-vW-Htc"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="kgY-j4-gD9" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-2351" y="789"/>
<point key="canvasLocation" x="-2333" y="759"/>
</scene>
<!--Timer-->
<scene sceneID="2vO-hC-wuw">