32 Commits
Author SHA1 Message Date
Andrew Case 066dc2b386 donion rings 2019-05-02 10:27:49 -04:00
Andrew Case 6aff162426 Oh dear god the end is near 2019-05-02 10:18:14 -04:00
Aaron Helton 0640f65746 Merge branch 'timer' into Timer 2019-04-30 11:56:06 -04:00
Andrew Case 34741d614e seconds is a trip uncle funkle 2019-04-25 10:50:14 -04:00
Andrew Case 97fc9d92c3 AAAAAAAAAAAAAAAAAAA PICKERS SUCK 2019-04-25 10:42:26 -04:00
Andrew Case 34ba756807 started on timer function 2019-04-25 10:42:25 -04:00
Andrew Case 990ab4d897 added outlets and actions 2019-04-25 10:42:24 -04:00
Andrew Case 3387d557c5 started work on timer, mostly ui bs 2019-04-25 10:42:24 -04:00
Aaron Helton 3187886ab1 Added gitignore file to ignore xcode stuff. 2019-04-25 10:42:06 -04:00
Andrew Case 13128d5152 trying to make pickers pick 2019-04-25 10:38:30 -04:00
Andrew Case 2e74e12cb0 AAAAAAAAAAAAAAAAAAA PICKERS SUCK 2019-04-25 10:35:27 -04:00
Andrew Case 0312806ea9 started on timer function 2019-04-25 09:40:45 -04:00
Timothy Davis 14d5748a89 Fixed WorldClockViewController not being a part of the target. 2019-04-23 23:05:50 -04:00
Timothy Davis 05c2520356 Merge branch 'Stopwatch' 2019-04-23 23:00:39 -04:00
Timothy Davis ba19deb6cb Fixed a bug with a button. Ready to merge
Clear Time would stay activated after pressing Stop, allowing the user to clear time over and over again regardless of whether or not the time was 0:00:00.000.
2019-04-23 23:00:22 -04:00
Timothy Davis e1203474d8 Stopwatch is fully functional as of this commit. 2019-04-23 23:00:22 -04:00
Timothy Davis 98489e32f0 Stopwatch is about 99% working.
The only issue with the code is clearLastLapButton. The clear lap buttons aren't greyed out whenever the text view is empty.
2019-04-23 23:00:22 -04:00
Timothy Davis 7bb1a7b0ce The Stopwatch itself is fully functional as of this commit.
The only remaining task is to finish up the buttons controlling laps.
2019-04-23 23:00:22 -04:00
Timothy Davis 187348ec3f Stopwatch is mostly functional -- more below
The stopwatch still counts time after the user has pressed stop, and will snap to the total elapsed time after the user presses start.
The intended effect would be for elapsed time to pause after the user presses stop
2019-04-23 23:00:22 -04:00
Timothy Davis 4ba4394d53 Created appropriate outlets and actions for Stopwatch. 2019-04-23 23:00:22 -04:00
Aaron Helton 12a554d34b Changed the TimeZones to have major cities or countries as applicable. All notable timezones added now. 2019-04-23 10:14:20 -04:00
Aaron Helton 908db7fd74 I did some stuff 2019-04-23 10:14:20 -04:00
Aaron Helton d6227500b3 Clock now ticks successfully using async thread. Connected picker to view with basic array of UTC Hours offsets.
The hours offsets should be replaced later, as they are currently only a placeholder until we can get a more complete list of UTC offsets and corresponding cities to fill in the gaps.
2019-04-23 10:14:20 -04:00
Andrew Case 7928e2d70d added outlets and actions 2019-04-22 13:46:12 -04:00
Andrew Case b566021273 started work on timer, mostly ui bs 2019-04-22 13:38:39 -04:00
Timothy Davis 00b7779ff2 Revert "Merge pull request #2 from Aargonian/revert-1-Stopwatch"
This reverts commit 049a50aee9, reversing
changes made to cc8fcca473.
2019-04-21 15:14:19 -04:00
Aaron Helton 049a50aee9 Merge pull request #2 from Aargonian/revert-1-Stopwatch
Revert "Connected empty swift files for each view."
2019-04-19 15:39:37 -04:00
Aaron Helton 87a319e0c7 Revert "Connected empty swift files for each view." 2019-04-19 15:38:06 -04:00
Aaron Helton cc8fcca473 Merge pull request #1 from Timothy-Davis/Stopwatch
Connected empty swift files for each view.
2019-04-19 15:36:24 -04:00
Timothy Davis 83033f4f96 Connected empty swift files for each view.
Except for WorldClock, because it's in the UTC branch already.
2019-04-19 15:22:37 -04:00
Aaron Helton e31938e07f Basic UI Created. I mean... very basic. 2019-04-19 11:41:59 -04:00
Aaron Helton f57d0ba9ed Initial Commit 2019-04-16 11:45:52 -04:00