Commit Graph

122 Commits

Author SHA1 Message Date
Aaron e41c0ea067 Revert "Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main"
This reverts commit ecd15bb30a, reversing
changes made to acfcdbed24.
2021-01-21 14:29:56 -05:00
Aaron ecd15bb30a Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main 2021-01-21 14:29:30 -05:00
Aaron acfcdbed24 Integrating PuzzleWakeMethod (1/2) 2021-01-21 14:27:27 -05:00
Andrew d200984eaf Simpler Quadratic Problems with a-value of 1 2021-01-21 14:26:56 -05:00
Hykilpikonna d999944dfa [F] Forgot to commit the storyboard 2021-01-21 13:58:28 -05:00
Hykilpikonna 634ad5aaf8 [+] Add a button to stop an alarm 2021-01-21 13:57:37 -05:00
Aaron 2eeb560fbb Started noticiation logic. 2021-01-21 13:46:08 -05:00
Aaron 9312184177 Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main 2021-01-21 09:33:05 -05:00
Aaron 17b300e74c Update AlarmActivationViewController.swift 2021-01-21 09:32:56 -05:00
Hykilpikonna 996a1b343b [PR][F] Vanilla - Fix date index out of range error.
[F] Fix date index out of range error.
2021-01-20 23:51:33 -05:00
VergeDX 03e52c7cb4 [F] Fix date index out of range error. 2021-01-21 10:37:54 +08:00
Hykilpikonna d9a1fe4649 Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main 2021-01-20 15:31:04 -05:00
Hykilpikonna 950e86302c [+] Write comments for Dallon's Code 2021-01-20 15:30:24 -05:00
Andrew b987823a8e Three Simple Math Problems Added
Two simple Algebra Problem (one with two expressions and one with three expressions) and a quadratic problem
2021-01-20 15:18:43 -05:00
Dallon Archibald 5a64dab670 Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main 2021-01-20 11:34:46 -05:00
Dallon Archibald ef72aa8b91 Added alarm name in storyboard and started implementation of adding alarms 2021-01-20 11:34:33 -05:00
Andrew e9d0500132 Math Expression Class to generate math problems 2021-01-20 11:24:53 -05:00
Aaron d5cfddb3fb Merge branch 'main' of github.com:hykilpikonna/ProjectClock into main 2021-01-20 11:24:00 -05:00
Aaron 84e4358fbc Added WakeMethod differentiation 2021-01-20 11:23:50 -05:00
Dallon Archibald f9c1af7fd8 Corrected outlets 2021-01-20 11:10:10 -05:00
Dallon Archibald 54dad7f1d4 Implemented basic outlets 2021-01-20 11:03:36 -05:00
Andrew 56fb9b6a3d setData function
Terrible code, but it works...

With Love,
Andrew Vittiglio
2021-01-19 11:44:05 -05:00
Hykilpikonna 26752f607e [F] Refresh table when alarms are changed 2021-01-17 17:10:58 -05:00
Hykilpikonna a57ab9c2f8 [F] Add debug alarm with lastActivate one minutes prior 2021-01-17 16:38:51 -05:00
Hykilpikonna 2c5f28c97b [O] Implement obj.apply {} like Kotlin 2021-01-17 16:34:20 -05:00
Hykilpikonna 7e4dc51da8 [O] Move default values to alarm constructor 2021-01-17 16:30:18 -05:00
Hykilpikonna 2cd464c890 [+] Add button to delete all alarms 2021-01-17 16:27:51 -05:00
Hykilpikonna d01d56b6ef [O] Loop alarm sound + vibration 2021-01-17 16:18:56 -05:00
Hykilpikonna 788d43e333 [F] Fix alarm detection in the same minute 2021-01-17 16:18:28 -05:00
Hykilpikonna a493bfe6e8 [+] Disable alarm after activating 2021-01-17 16:00:56 -05:00
Hykilpikonna c54e18ad64 [O] Make Alarm a class 2021-01-17 15:59:25 -05:00
Hykilpikonna ce9cbd7127 [F] Fix no segue with identifier 'activate-alarmactivate-alarm'' 2021-01-17 15:48:23 -05:00
Hykilpikonna 33c6173785 [+] Play sound when alarm is activated 2021-01-17 15:48:07 -05:00
Hykilpikonna cb80b2925d [+] Create add alarm debug button 2021-01-17 15:47:20 -05:00
Hykilpikonna 06d639c912 [-] Remove unlinked outlets 2021-01-17 15:14:55 -05:00
Hykilpikonna d90c792436 [+] Allow AlarmActivator to segue to the alarm activating view 2021-01-17 15:13:11 -05:00
Hykilpikonna f88c48b9ad [+] Get alarms to activate in AlarmActivator 2021-01-17 15:04:17 -05:00
Hykilpikonna ce758633b0 [F] Use lastActivate as the base for nextActivate rather than current date 2021-01-17 14:58:28 -05:00
Hykilpikonna d0ab0ba81d [+] Authorize badge and sound for alerts too 2021-01-17 14:57:01 -05:00
Hykilpikonna a4de8274d4 [M] Rearrange files 2021-01-17 14:56:10 -05:00
Hykilpikonna 31afd97850 [+] Set alarm table cell's going off text 2021-01-17 14:50:13 -05:00
Hykilpikonna a3252603fb [+] Create toString for TimeInterval 2021-01-17 14:48:58 -05:00
Hykilpikonna e0b6eb41fd [+] Create function to get alarms activating now 2021-01-17 14:31:29 -05:00
Hykilpikonna ba50233bd2 [+] Allow one-time alarms to bypass repeating date check 2021-01-17 14:27:36 -05:00
Hykilpikonna 79202c71f3 [+] Make sure it repeats on that day 2021-01-17 14:26:17 -05:00
Hykilpikonna 7e17405858 [+] Create computed field nextActivate to calculate the next activation date for an alarm 2021-01-17 14:25:35 -05:00
Hykilpikonna c3c2142418 [+] Add autoDisable field to alarm 2021-01-17 14:25:03 -05:00
Hykilpikonna 251b281a04 [+] Add repeats field to alarm 2021-01-17 14:24:43 -05:00
Hykilpikonna ce9cf95e47 [O] Use hour + minute instead of Date when storing alarm time 2021-01-17 14:24:26 -05:00
Hykilpikonna 3cc0672d26 [+] Create function date.added() to modify the date 2021-01-17 14:23:28 -05:00