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.

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

adjust ui: colors, jingle, icon, fix whitespace #98

Merged
merged 6 commits into from
Oct 29, 2020

Conversation

sigmund-c
Copy link

@sigmund-c sigmund-c commented Oct 25, 2020

*ps. This PR is gonna be a bit annoying, sorry
Fixes #61
Added McDonald's Jingle (annoying part) #67
Changed GUI to white/yellow/red (also annoying) #69
Changed app icon to McD's #71
image

@sigmund-c sigmund-c added type.Enhancement An enhancement to an existing story priority.Medium Nice to have severity.Medium A flaw that causes occasional inconvenience to some users but they can continue to use the product. labels Oct 25, 2020
@sigmund-c sigmund-c added this to the v1.3 milestone Oct 25, 2020
@codecov-io
Copy link

Codecov Report

Merging #98 into master will decrease coverage by 0.23%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master      #98      +/-   ##
============================================
- Coverage     59.26%   59.02%   -0.24%     
  Complexity      580      580              
============================================
  Files           119      120       +1     
  Lines          2251     2260       +9     
  Branches        264      264              
============================================
  Hits           1334     1334              
- Misses          846      855       +9     
  Partials         71       71              
Impacted Files Coverage Δ Complexity Δ
src/main/java/seedu/address/ui/JinglePlayer.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
src/main/java/seedu/address/ui/UiManager.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e84ba73...b91262d. Read the comment docs.

@sigmund-c sigmund-c removed the severity.Medium A flaw that causes occasional inconvenience to some users but they can continue to use the product. label Oct 25, 2020
Copy link

@WangZijun97 WangZijun97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly a bug, also do update with the master branch (can be done after the rest of 1.3 is ready since this is the last update to be merged).

@@ -0,0 +1,393 @@
.background {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file the alternative color scheme? Maybe can make use of UserPrefs to allow users to switch to this. Also would be good if the duplicates in the two themes are condensed into one place so that we don't need to edit both when including new GUI elements. Otherwise there will be two representations of some parts of our GUI styling.

Comment on lines +369 to +373
#shiftAssignments .label,
#workerAssignments .label,
#unavailableTiming .label,
#leaveShiftAssignments .label,
#leaveWorkerAssignments .label {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated with current master branch code.

@@ -0,0 +1,24 @@
package seedu.address.ui;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if its because of my system but the jingle seems to get cut off halfway through when playing on startup.

@tnsyn tnsyn merged commit 5672f2a into AY2021S1-CS2103-F10-4:master Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority.Medium Nice to have type.Enhancement An enhancement to an existing story
Projects
None yet
4 participants