Skip to content

Commit

Permalink
Merge pull request #113 from JeffinsonDarmawan/bug-fix
Browse files Browse the repository at this point in the history
Changed Ui for recommend to remove redundancy and grammar errors
  • Loading branch information
samuelory committed Apr 8, 2024
2 parents affab09 + 4cd873a commit cf5874e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Format: `mybouquets`

Expected output:
```
Here are the list of your saved bouquets:
Here is the list of your saved bouquets:
1. For Girlfriend :
No flowers added so far
```
Expand Down Expand Up @@ -201,7 +201,7 @@ Steps:
Expected output:
```
For what occasion are you buying flowers for?
Here are the list of our available occasion:
Here is the list of our available occasion:
Here are all the occasions associated with the available flowers:
- Funeral
- Wedding
Expand All @@ -214,7 +214,7 @@ ____________________________________________________________
Expected output:
```
What colour would you like your bouquets to be?
Here are the list of colours available for the occasion:
Here is the list of colours available for the occasion:
- DARK_CRIMSON
- WHITE
```
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/florizz/core/Ui.java
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ public void printIOError() {
*/
public String printAskOccasion() {
System.out.println("For what occasion are you buying flowers for?");
System.out.println("Here are the list of our available occasion:");
this.printAllOccasions();
return inputScanner.nextLine();
}
Expand All @@ -368,7 +367,7 @@ public String printAskColour(ArrayList<Flower> eligibleFlowers) {
System.out.println("What colour would you like your bouquets to be?");

// print all available colours in a given array list
System.out.println("Here are the list of colours available for the occasion: ");
System.out.println("Here is the list of colours available for the occasion: ");
// remove duplicate colours in eligible flowers
ArrayList<String> colourList = new ArrayList<>();
for (Flower flower : eligibleFlowers) {
Expand All @@ -379,6 +378,7 @@ public String printAskColour(ArrayList<Flower> eligibleFlowers) {
for (String colour : colourList){
System.out.println("- " + colour);
}
printBreakLine();
return inputScanner.nextLine();
}

Expand Down

0 comments on commit cf5874e

Please sign in to comment.