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.

Sign up for GitHub

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

Jump to bottom

Timer screen #7

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open

Timer screen #7

wants to merge 29 commits into from

Conversation

angelahao6
Copy link
Contributor

  • Added timer screen
  • Added timer onto timer screen
  • Has time picker and can change time when timer is running
  • Added pause/resume button (button is disabled when timer is not set)

@angelahao6
Fix bad setState() issue
52f9f16
@angelahao6
Add image icon
5a02a40
@angelahao6
Resolve merge conflicts
59901ac
@angelahao6
Add modal, icons and background
bd5bfd6
@angelahao6
Allow icons be hidden, fix modal height
b3a9ce8
@angelahao6
Fixed modals to fill up entire screen
ec7b0be
@angelahao6
Remove hard-code position for modals
8d76f9b
@angelahao6
Fix modal positioning
0043c27
@angelahao6
Start content
37e4dae
@angelahao6
Fix rectangle position
432c265
@angelahao6
Resolve merge conflicts
08cfc98
@angelahao6
Add hard-code contents in modals
d4adafd
@angelahao6
Integrate timer, fix modal content, css update
169c20c
@angelahao6
Sound plays multiple times at once
e127063
@angelahao6
Add new changes
e02f043
@angelahao6
Can play/stop music
c0df7fa
@angelahao6
Add buttons to image modal
0e8f940
@angelahao6
add images to image modal
8a8d7f1
@angelahao6
allow user to change image background
915e53c
@angelahao6
change music
c2f2345
@angelahao6
add back and forwards functionality for music
2b9fc7d
@angelahao6
Add back and forward music functionality
72e8d4d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdebbaruah cdebbaruah Awaiting requested review from cdebbaruah

@jjasminew jjasminew Awaiting requested review from jjasminew

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@angelahao6 @jjasminew