Code

Zouf-and-Justine_Time_Unit-1-Final#10

Code

Open

JustineKay wants to merge 45 commits intoaccesscode-2-2:masteraccesscode-2-2/unit-1-final-project:masterfrom JustineKay:masterJustineKay/unit-1-final-project:masterCopy head branch name to clipboard

+3,626-66

Commits

Commits on Aug 22, 2015

• first commit

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  e1ade91

  Copy full SHA for e1ade91

• Began storyboard layout

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  eeae6d8

  Copy full SHA for eeae6d8

• properties added

  zoufishanmehdi

  committed
  6b7a2a8

  Copy full SHA for 6b7a2a8

• Began to hook up the Set Timer picker view

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  1795612

  Copy full SHA for 1795612

• TimerHomepage pickerView works

  zoufishanmehdi

  committed
  69f2fdd

  Copy full SHA for 69f2fdd

• edited PresetTimer

  zoufishanmehdi

  committed
  db51e14

  Copy full SHA for db51e14

• Added singleton class

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  5abbea9

  Copy full SHA for 5abbea9

• changed back to NSMutableArray

  zoufishanmehdi

  committed
  5375340

  Copy full SHA for 5375340

Commits on Aug 23, 2015

• singleton class is set up and working

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  848825f

  Copy full SHA for 848825f

• started working on stopwatch

  zoufishanmehdi

  committed
  ad2e9c8

  Copy full SHA for ad2e9c8

• Working on picker views

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  df0ab71

  Copy full SHA for df0ab71

• picker views functioning, will work on updating labels on timer hompage next

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  ef34b7a

  Copy full SHA for ef34b7a

• timer time label working

  zoufishanmehdi

  committed
  4378276

  Copy full SHA for 4378276

• timelabel and presettimerlabel are functioning, will work on setting timer without saving a preset

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  5587d2b

  Copy full SHA for 5587d2b

• user can set timer without saving, without setting a preset name

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  571f074

  Copy full SHA for 571f074

• setting up startPauseButton

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  e20a750

  Copy full SHA for e20a750

Commits on Aug 26, 2015

• timer start button and user selection working

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  cb814f4

  Copy full SHA for cb814f4

• reorganizing data in TimerHomepageViewController

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  1523ef8

  Copy full SHA for 1523ef8

Commits on Aug 27, 2015

• changes made to Stopwatch storyboard

  zoufishanmehdi

  committed
  65ff22d

  Copy full SHA for 65ff22d

• changes made to stopwatch.m and stopwatch TVC

  zoufishanmehdi

  committed
  b286411

  Copy full SHA for b286411

Commits on Aug 28, 2015

• Stopwatch works

  zoufishanmehdi

  committed
  ae24121

  Copy full SHA for ae24121

• still reconfiguring timerHomepageViewController and setTimerViewController

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  2c15900

  Copy full SHA for 2c15900

• timer working, test next

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  fdcedb7

  Copy full SHA for fdcedb7

Commits on Aug 29, 2015

• added Countdown

  zoufishanmehdi

  committed
  d493260

  Copy full SHA for d493260

• event countdown works

  zoufishanmehdi

  committed
  341b32e

  Copy full SHA for 341b32e

• Working on UI

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  62aa926

  Copy full SHA for 62aa926

• tab bar icons working

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  e5fec75

  Copy full SHA for e5fec75

Commits on Aug 30, 2015

• timer homepage ui first draft complete

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  e541a7e

  Copy full SHA for e541a7e

• stopwatch ui in process

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  4bc1d94

  Copy full SHA for 4bc1d94

• working on setTimer ui

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  24829d0

  Copy full SHA for 24829d0

• sounds added

  zoufishanmehdi

  committed
  0b3969e

  Copy full SHA for 0b3969e

• setTimer ui looking alright :)

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  5cf9cfb

  Copy full SHA for 5cf9cfb

• sound files fixed

  zoufishanmehdi

  committed
  2fa2acd

  Copy full SHA for 2fa2acd

• justine changes

  zoufishanmehdi

  committed
  12f926c

  Copy full SHA for 12f926c

• countdown label separated into days, hrs, mins and secs

  zoufishanmehdi

  committed
  239075e

  Copy full SHA for 239075e

• playing with timer animations

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  1899965

  Copy full SHA for 1899965

Commits on Aug 31, 2015

• UI done

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  632355b

  Copy full SHA for 632355b

Commits on Sep 1, 2015

• entire background color changes when done

  zoufishanmehdi

  committed
  f553144

  Copy full SHA for f553144

• Cleaned up a few bugs with animations, start button on timer, stopwatch table view background color

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  ff284ba

  Copy full SHA for ff284ba

Commits on Sep 2, 2015

• fixed the countdown clock, user cannot choose a past date

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  00fd286

  Copy full SHA for 00fd286

Commits on Sep 3, 2015

• countdown timer bugs fixed

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  9b00117

  Copy full SHA for 9b00117

• Fixed Timer Bugs

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  89361ed

  Copy full SHA for 89361ed

• cleaned up timer

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  81fd6dc

  Copy full SHA for 81fd6dc

Commits on Sep 4, 2015

• clean up before demo

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  eccccd7

  Copy full SHA for eccccd7

Commits on Sep 10, 2015

• added lost font file, changed bundle identifier

  

  Justine Gartner

  authored and

  Justine Gartner

  committed
  106e4da

  Copy full SHA for 106e4da