Skip to content

Pull Re-Questlove. #2

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
wants to merge 90 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
9e4816a
adding timer
kairarobot Aug 21, 2015
01c580f
Commit Fri 2:24pm
Aug 21, 2015
e3c534d
working stopwatch
kairarobot Aug 21, 2015
b2f8ea8
added README
Aug 21, 2015
8eaa5e5
adding pause
kairarobot Aug 21, 2015
7514a0b
timer
kairarobot Aug 21, 2015
b96a591
added Lap Number Indicator
Aug 21, 2015
cfed032
adding timer
kairarobot Aug 22, 2015
a4c938a
adding stopwatch with working pause time
kairarobot Aug 22, 2015
f3dca24
working stopwatch with reset button
Aug 22, 2015
170bd02
update stopwatch buttons to appear/disappear
Aug 22, 2015
f0b4de5
complete stopwatch functionality
Aug 22, 2015
441fcb5
stopwatch working and table view in timer added
kairarobot Aug 22, 2015
135f33e
singleton working
kairarobot Aug 23, 2015
66a0ac2
adding the tableview
kairarobot Aug 23, 2015
b14562c
created timer view controller
Aug 23, 2015
52f248f
updated timer viewcontroller
Aug 23, 2015
c556a73
added the stuffszz
kairarobot Aug 23, 2015
1f9f52c
added buttons to timer
Aug 23, 2015
dff06bc
added calendar view
kairarobot Aug 24, 2015
7e2ef47
updating this project
kairarobot Aug 24, 2015
87fad54
Workout list now static tableview
Aug 24, 2015
445c68d
hooked up image code
Aug 24, 2015
da5882a
changes
kairarobot Aug 25, 2015
298b305
updating storyboard
kairarobot Aug 25, 2015
bfa7bd4
working countdown calendar
kairarobot Aug 25, 2015
d0ab511
working calendar countdown
kairarobot Aug 25, 2015
0e61099
working GoFight ViewController
Aug 25, 2015
47e61da
update GOFight
Aug 25, 2015
16fa710
adding calendar
kairarobot Aug 25, 2015
8d8302c
working NSDictionary for the calendar
kairarobot Aug 26, 2015
2d79353
Merge branch 'master' of https://github.com/Zovfreullia/unit-1-final-…
kairarobot Aug 26, 2015
2b116c0
unit 1
kairarobot Aug 29, 2015
fb90b46
gofight timer almost complete functionality
Aug 26, 2015
e386365
fixed font
Aug 26, 2015
71ced38
updates code fails
Aug 26, 2015
87ddb89
updated timer to show mm:ss
Aug 27, 2015
d1df697
added workouts with no pics fixed timer
Aug 27, 2015
f16729c
complete GOBuild functionality
Aug 28, 2015
0b69650
gobuild added
Aug 28, 2015
2c4ccf8
updated GOBUILD
Aug 28, 2015
f04e12a
update FightTimer
Aug 29, 2015
9c5f302
update fight but now has glitches
Aug 29, 2015
f320f4b
up to date jamaal
Aug 29, 2015
7b9b8ce
some new images with my best friend mike
Aug 29, 2015
b85e9f7
this is the project now
Aug 29, 2015
aeed572
this is project now 10pm
Aug 30, 2015
8dbb437
updated the delete buttons on the tableview and I'm currently edting …
kairarobot Aug 30, 2015
6f14ea5
updating changes
kairarobot Aug 30, 2015
ceb2344
updated the label on custom workout so it shows on the screen
kairarobot Aug 30, 2015
eaf56f1
updating the build buttons
kairarobot Aug 30, 2015
9f4a57e
pushing stuff
kairarobot Aug 30, 2015
9d5875f
custom workout conditions for text field
kairarobot Aug 31, 2015
5aa1839
updated theme
kairarobot Aug 31, 2015
bad2ab7
fixed GoBuild funcionality
Sep 1, 2015
a9793fc
changed the font on go lean and go hard
kairarobot Sep 1, 2015
824af6e
added return key
kairarobot Sep 1, 2015
5999351
updates
kairarobot Sep 1, 2015
0c4ba8c
adding sounds
kairarobot Sep 1, 2015
17adeb4
updated the audio files
kairarobot Sep 1, 2015
20a22a3
Update README.md
kairarobot Sep 2, 2015
ed8e217
more images added
Sep 3, 2015
86e2e7f
updated voice
kairarobot Sep 3, 2015
ee9d81c
added all b and w photots for go hard
kairarobot Sep 3, 2015
d862068
updated
kairarobot Sep 3, 2015
7f84e2c
updated pictures for go hard and lean
kairarobot Sep 3, 2015
389d896
adding changes
kairarobot Sep 3, 2015
074b521
adding a slide
kairarobot Sep 8, 2015
adbbdbc
updating the README
kairarobot Sep 10, 2015
768ad1c
adding image1
kairarobot Sep 10, 2015
16d7e0c
updating readme
kairarobot Sep 10, 2015
3bb2945
adding image1
kairarobot Sep 10, 2015
f91ebf6
adding image1
kairarobot Sep 10, 2015
3aa9050
adding image1
kairarobot Sep 10, 2015
94177ad
adding image1
kairarobot Sep 10, 2015
eabc608
adding image1
kairarobot Sep 10, 2015
29b8672
adding image1
kairarobot Sep 10, 2015
5e4070a
adding image1
kairarobot Sep 10, 2015
c580d84
adding image1
kairarobot Sep 10, 2015
a762f1a
adding image1
kairarobot Sep 10, 2015
c7629e0
adding image1
kairarobot Sep 10, 2015
55d47de
adding image1
kairarobot Sep 10, 2015
f6e8846
changed name
kairarobot Sep 10, 2015
e475dbd
changed name
kairarobot Sep 10, 2015
eacf989
changed name
kairarobot Sep 10, 2015
d69ff41
c
kairarobot Sep 10, 2015
b6bcf3d
Update README.md
kairarobot Oct 9, 2016
587b55e
Update README.md
kairarobot Oct 9, 2016
f0e4488
Update README.md
kairarobot Oct 9, 2016
2058283
Update README.md
kairarobot Apr 12, 2017
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
735 changes: 735 additions & 0 deletions GO.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

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

89 changes: 20 additions & 69 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,69 +1,20 @@
# Unit 1 Final Project

**Dates:**
09/01 - Practice demos
09/03 - Final demos

## Feature Requirements
2 primary screens

* Stopwatch
* Laps
* Pause
* Reset
* Timer
* User can create preset timers (popcorn, coffee, running, etc)
* User can select from preset timers
* User can set a one time timer
* User can pause timer
* Special events countdown (graduation, birthday, labor day)

## Technical Requirements
* NSTimer or alternative (CADisplayLink, performSelector:)
* UITabBarController
* UITabBar with UIImage
* Each screen is a separate UIViewController

## Project Plan
* Outlining tasks based on user stories
* Delegation of tasks amongst team members
* Work should be evenly divided
* Identify checkpoints
* Communcation plan

## Bonus
* Progress indicator for timer
* Sounds, vibrations
* World Clock (additional tab)
* Themed UI

## Extra bonus
* Backgrounding
* Local notifications

User stories define product features
Present for feedback

## Inspiration

**[Timer +](https://itunes.apple.com/us/app/timer+/id391564049?mt=8)**

<img src="http://a4.mzstatic.com/us/r30/Purple5/v4/26/5a/37/265a3770-3c53-0b02-0075-bbbd0661c16e/screen322x572.jpeg" width="200">
<img src="http://a1.mzstatic.com/us/r30/Purple5/v4/fd/fb/f7/fdfbf7a9-a82e-10c7-5844-482ec9e46a80/screen322x572.jpeg" width="200">

**[Time Timer](https://itunes.apple.com/us/app/time-timer/id332520417?mt=8)**

<img src="http://a2.mzstatic.com/us/r30/Purple7/v4/81/71/ae/8171aee1-9511-1d79-4cd3-61983e6ec927/screen322x572.jpeg" width="200">
<img src="http://a4.mzstatic.com/us/r30/Purple5/v4/5b/73/4d/5b734d7a-268a-dbe4-e39b-69ed3aa3ef56/screen322x572.jpeg" width="200">

**[Countdown](https://itunes.apple.com/us/app/countdown!!-event-reminders/id424216726?mt=8)**

<img src="http://a3.mzstatic.com/us/r30/Purple1/v4/e3/ec/4c/e3ec4c25-bf91-214d-33c3-4f1634d8827f/screen322x572.jpeg" width="200">
<img src="http://a1.mzstatic.com/us/r30/Purple7/v4/2b/6c/b5/2b6cb5a3-df2d-1fcb-cfdd-38782a32d20e/screen640x640.jpeg" width="400">

**[Hours Time Tracking](https://itunes.apple.com/us/app/hours-time-tracking/id895933956?mt=8)**

<img src="http://a3.mzstatic.com/us/r30/Purple5/v4/7e/f6/6d/7ef66d2e-65d0-b698-8d5a-7f07107b2b34/screen322x572.jpeg" width="200">
<img src="http://a1.mzstatic.com/us/r30/Purple3/v4/30/ea/c7/30eac7e2-8737-e657-48bc-0363d1c27099/screen322x572.jpeg" width="200">


GO

<a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/mit-license-brightgreen.svg" alt="mit license"></a>

A workout application available for iPhones. GO is a fitness application that makes tracking time easy for you.

<b>Description</b>: This is a fully-functional open-source workout application. There are four focuses: cardio, toning, lifting weights, and sparring. Each form of exercise is covered through a timer that targets specific muscle groups.

Functionality:
* Stopwatch with laps
* Customizable date countdowns
* Available cardio workouts with automatic timer
* Customizable workouts that counts down for you
* Weight training list that can be checked off

![GO](/images/goshot1.png?raw=true "Optional Title")

![GO](/images/goshot2.png?raw=true "Optional Title")

![GO](/images/goshot3.png?raw=true "Optional Title")
Loading