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

Update UI to match project UI mockup #75

Merged

Conversation

siddarth2824
Copy link

Updates that were made to the UI to match the UI mockup which can be viewed here:

  1. Changed the layout of the elements
  2. Changed the respective background colors to match the UI mockup
  3. Changed the font styles of all the fonts
  4. Added functionality to the tabs to switch windows by setting the relevant fxml file as the focused element in the main display placeholder
  5. Added border radius to the result display box to match UI mockup
  6. Added padding between each transaction card to match UI mockup

@siddarth2824 siddarth2824 added type.enhancement 👍 New feature or request priority.medium 🥈 Todo for current iteration type.task 📋 Miscellaneous tasks that aren't feature or documentation-related labels Oct 7, 2020
@siddarth2824 siddarth2824 added this to the v1.2 milestone Oct 7, 2020
@siddarth2824 siddarth2824 requested a review from a team October 7, 2020 02:39
@ianyong
Copy link
Member

ianyong commented Oct 7, 2020

Could you rebase to address merge conflicts before we start reviewing?

@ianyong ianyong removed the type.task 📋 Miscellaneous tasks that aren't feature or documentation-related label Oct 7, 2020
@codecov-io
Copy link

codecov-io commented Oct 7, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@3e647c1). Click here to learn what that means.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #75   +/-   ##
=========================================
  Coverage          ?   67.95%           
  Complexity        ?      404           
=========================================
  Files             ?       78           
  Lines             ?     1323           
  Branches          ?      115           
=========================================
  Hits              ?      899           
  Misses            ?      393           
  Partials          ?       31           
Impacted Files Coverage Δ Complexity Δ
...a/ay2021s1_cs2103_w16_3/finesse/ui/CommandBox.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...a/ay2021s1_cs2103_w16_3/finesse/ui/MainWindow.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...021s1_cs2103_w16_3/finesse/ui/TransactionCard.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
..._cs2103_w16_3/finesse/ui/TransactionListPanel.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
..._cs2103_w16_3/finesse/ui/expense/ExpensePanel.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...s1_cs2103_w16_3/finesse/ui/income/IncomePanel.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 3e647c1...b89883a. Read the comment docs.

src/main/resources/view/ResultDisplay.fxml Show resolved Hide resolved
src/main/resources/view/MainWindow.fxml Outdated Show resolved Hide resolved
src/main/resources/view/MainWindow.fxml Outdated Show resolved Hide resolved
src/main/resources/view/MainWindow.fxml Outdated Show resolved Hide resolved
@siddarth2824 siddarth2824 force-pushed the siddarth/update-ui branch 2 times, most recently from a1ee658 to cf75142 Compare October 7, 2020 16:12
Copy link
Member

@ianyong ianyong left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link

@zhaojj2209 zhaojj2209 left a comment

Choose a reason for hiding this comment

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

LGTM!

@ianyong ianyong merged commit 6ff9bd6 into AY2021S1-CS2103T-W16-3:master Oct 7, 2020
@siddarth2824 siddarth2824 deleted the siddarth/update-ui branch October 11, 2020 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority.medium 🥈 Todo for current iteration type.enhancement 👍 New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants