Skip to content

Commit

Permalink
Improve overall GUI, dialog error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffsieu
jeffsieu committed Oct 31, 2021
1 parent e6e3a30 commit 8ce1403
Show file tree
Hide file tree
Showing 37 changed files with 484 additions and 415 deletions.
4 changes: 2 additions & 2 deletions src/main/java/seedu/address/model/task/Contact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
public class Contact {
private final Name name;

private boolean isInAddressBook;
private final boolean isInAddressBook;

/**
* Creates a Name with the given string.
Expand All @@ -32,7 +32,7 @@ public Name getName() {
return name;
}

public boolean getIsInAddressBook() {
public boolean isInAddressBook() {
return isInAddressBook;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/model/task/Task.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public boolean isOverdue() {
if (timestamp == null) {
return false;
} else {
return LocalDate.now().isAfter(timestamp.getTimestamp());
return LocalDate.now().isAfter(timestamp.getDate());
}
}

Expand Down
10 changes: 9 additions & 1 deletion src/main/java/seedu/address/model/task/Timestamp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public class Timestamp {

private final LocalDate timestamp;

private Timestamp(LocalDate date) {
this.timestamp = date;
}

/**
* Creates a TimeStamp with the given string.
* @param timestamp the string representing the timestamp
Expand All @@ -33,6 +37,10 @@ public static Timestamp of(String timestamp) throws ParseException {
return new Timestamp(timestamp);
}

public static Timestamp of(LocalDate date) {
return new Timestamp(date);
}

/**
* Factory method for mapping
*
Expand Down Expand Up @@ -65,7 +73,7 @@ public String toString() {
return this.timestamp.toString();
}

public LocalDate getTimestamp() {
public LocalDate getDate() {
return this.timestamp;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/storage/JsonAdaptedContact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public JsonAdaptedContact(@JsonProperty("name") String name,
*/
public JsonAdaptedContact(Contact source) {
name = source.getName().fullName;
isInAddressBook = source.getIsInAddressBook();
isInAddressBook = source.isInAddressBook();
}

/**
Expand Down
189 changes: 157 additions & 32 deletions src/main/java/seedu/address/ui/EditTaskDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static seedu.address.commons.util.AppUtil.getImage;
import static seedu.address.ui.UiManager.ICON_APPLICATION;

import java.util.HashSet;
import java.time.LocalDate;
import java.util.Optional;

import javafx.beans.Observable;
Expand All @@ -14,29 +14,44 @@
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox;
import javafx.scene.control.DatePicker;
import javafx.scene.control.Dialog;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.skin.DatePickerSkin;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Region;
import javafx.stage.Stage;
import javafx.util.StringConverter;
import seedu.address.model.person.Name;
import seedu.address.model.tag.Tag;
import seedu.address.model.task.Contact;
import seedu.address.model.task.Task;
import seedu.address.model.task.Timestamp;

public class EditTaskDialog extends UiPart<Region> {
private static final String FXML = "EditTaskDialog.fxml";
private static final String PROMPT_ENTER_TAG = "Press \"enter\" to add tag";
private static final String PROMPT_ENTER_CONTACT = "Press \"enter\" to add contact";

@FXML
private TextField title;

@FXML
private Label titleErrorLabel;

@FXML
private TextField description;

@FXML
private TextField timestamp;
private DatePicker timestamp;

@FXML
private Label timestampClearLabel;

@FXML
private CheckBox isDone;
Expand All @@ -48,12 +63,22 @@ public class EditTaskDialog extends UiPart<Region> {
private FlowPane tagPane;

@FXML
private Label tagErrorLabel;
private Label tagInfoLabel;

@FXML
private Label titleErrorLabel;
private TextField contactInput;

@FXML
private FlowPane contactPane;

@FXML
private Label contactInfoLabel;

@FXML
private Label dialogTitleLabel;

private final ObservableSet<Tag> tags;
private final ObservableSet<Contact> contacts;
private final Dialog<Task> dialog;

/**
Expand All @@ -70,61 +95,166 @@ public EditTaskDialog(Task t) {
.map(tags -> tags.toArray(new Tag[]{}))
.map(FXCollections::observableSet)
.orElse(FXCollections.observableSet());
contacts = Optional.ofNullable(t)
.map(Task::getContacts)
.map(contacts -> contacts.toArray(new Contact[]{}))
.map(FXCollections::observableSet)
.orElse(FXCollections.observableSet());

initializeDialog(t != null);
initializeFields(t);
initializeDatePickerRedirection();
}

private void initializeDatePickerRedirection() {
title.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
if (new KeyCodeCombination(KeyCode.TAB).match(event)) {
timestamp.show();
timestamp.requestFocus();
event.consume();
}
});
description.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
if (new KeyCodeCombination(KeyCode.TAB, KeyCombination.SHIFT_DOWN).match(event)) {
timestamp.show();
timestamp.requestFocus();
event.consume();
}
});

new DatePickerSkin(timestamp).getPopupContent().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
if (new KeyCodeCombination(KeyCode.TAB).match(event)) {
timestamp.hide();
description.requestFocus();
event.consume();
} else if (new KeyCodeCombination(KeyCode.TAB, KeyCombination.SHIFT_DOWN).match(event)) {
timestamp.hide();
title.requestFocus();
event.consume();
}
});
}

private void initializeFields(Task t) {
// Set fields to task content
Optional<Task> task = Optional.ofNullable(t);
title.setText(task.map(Task::getTitle).orElse(""));
description.setText(task.flatMap(Task::getDescription).orElse(""));
timestamp.setText(task.flatMap(Task::getTimestamp).map(Timestamp::toString).orElse(""));
timestamp.setValue(task.flatMap(Task::getTimestamp).map(Timestamp::getDate).orElse(null));
isDone.setSelected(task.map(Task::isDone).orElse(false));
tags.stream()
.map(tag -> new DeletableChip(tag.tagName, () -> tags.remove(tag)).getRoot())
.forEach(tagPane.getChildren()::add);
contacts.stream()
.map(contact -> new DeletableChip(contact.getName().fullName, () -> contacts.remove(contact)).getRoot())
.forEach(contactPane.getChildren()::add);

// Disallow timestamp manual input
timestamp.getEditor().setDisable(true);

// Initialize error labels
tagErrorLabel.setText("");
tagInfoLabel.setText(PROMPT_ENTER_TAG);
tagInfoLabel.setWrapText(true);
contactInfoLabel.setText(PROMPT_ENTER_CONTACT);
contactInfoLabel.setWrapText(true);
titleErrorLabel.setText("Title cannot be empty");
titleErrorLabel.getStyleClass().add("error");
titleErrorLabel.setVisible(false);
titleErrorLabel.setManaged(false);

// Show info labels only if focused
tagInfoLabel.visibleProperty().bind(tagInput.focusedProperty());
contactInfoLabel.visibleProperty().bind(contactInput.focusedProperty());
tagInfoLabel.managedProperty().bind(tagInput.focusedProperty());
contactInfoLabel.managedProperty().bind(contactInput.focusedProperty());

// Clear empty title error when anything is typed into the title
title.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
titleErrorLabel.setVisible(false);
titleErrorLabel.setManaged(false);
if (event.getCode().equals(KeyCode.ENTER)) {
event.consume();
timestamp.requestFocus();
}
});

// Create new tag when "enter" pressed in tag input
tagInput.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
tagErrorLabel.setText("");
tagInfoLabel.prefWidthProperty().bind(getRoot().widthProperty().subtract(32));
tagInfoLabel.getStyleClass().remove("error");
tagInfoLabel.setText(PROMPT_ENTER_TAG);
if (event.getCode().equals(KeyCode.ENTER)) {
event.consume();
try {
String text = tagInput.getText();
tagInput.clear();
Tag tag = new Tag(text);
if (tags.contains(tag)) {
throw new IllegalArgumentException("Tag already added");
}
tags.add(tag);
tagInput.clear();
} catch (IllegalArgumentException e) {
tagErrorLabel.setText(e.getMessage());
tagInfoLabel.setText(e.getMessage());
tagInfoLabel.getStyleClass().add("error");
}
}
});

// When tag list changes, update tag list
// Create new tag when "enter" pressed in tag input
contactInput.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
contactInfoLabel.prefWidthProperty().bind(getRoot().widthProperty().subtract(32));
contactInfoLabel.getStyleClass().remove("error");
contactInfoLabel.setText(PROMPT_ENTER_CONTACT);
if (event.getCode().equals(KeyCode.ENTER)) {
event.consume();
try {
String text = contactInput.getText();
Contact contact = new Contact(new Name(text));
if (contacts.contains(contact)) {
throw new IllegalArgumentException("Contact already added");
}
contacts.add(contact);
contactInput.clear();
} catch (IllegalArgumentException e) {
contactInfoLabel.setText(e.getMessage());
contactInfoLabel.getStyleClass().add("error");
}
}
});

// When tag list changes, update tag chip list
tags.addListener((Observable observable) -> {
tagPane.getChildren().clear();
tags.stream()
.map(tag -> new DeletableChip(tag.tagName, () -> tags.remove(tag)).getRoot())
.forEach(tagPane.getChildren()::add);
dialog.getDialogPane().getScene().getWindow().sizeToScene();
});

// When contact list changes, update contact chip list
contacts.addListener((Observable observable) -> {
contactPane.getChildren().clear();
contacts.stream()
.map(contact ->
new DeletableChip(contact.getName().fullName, () -> contacts.remove(contact)).getRoot())
.forEach(contactPane.getChildren()::add);
dialog.getDialogPane().getScene().getWindow().sizeToScene();
});

// Set timestamp format
timestamp.setConverter(new StringConverter<>() {
@Override
public String toString(LocalDate date) {
if (date != null) {
return date.toString();
} else {
return "";
}
}

@Override
public LocalDate fromString(String string) {
return LocalDate.parse(string);
}
});

timestampClearLabel.visibleProperty().bind(timestamp.valueProperty().isNotNull());
timestampClearLabel.setOnMouseClicked(event -> {
timestamp.setValue(null);
});
}

Expand All @@ -134,16 +264,17 @@ private void initializeDialog(boolean isEditingTask) {
stage.getIcons().add(getImage(ICON_APPLICATION));

// Set dialog title
dialog.setTitle(isEditingTask ? "Edit Task" : "Add Task");
String dialogTitle = isEditingTask ? "Edit Task" : "Add Task";
dialog.setTitle(dialogTitle);
dialogTitleLabel.setText(dialogTitle);

// Set dialog size
dialog.getDialogPane().setPrefWidth(600);
dialog.setResizable(true);

// Set dialog content
dialog.getDialogPane().setContent(getRoot());
dialog.getDialogPane().getStylesheets().add("view/DarkTheme.css");
dialog.getDialogPane().getStyleClass().add("stack-pane");
dialog.getDialogPane().getStyleClass().add("background");

// Add dialog buttons
ButtonType buttonTypeOk = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
Expand All @@ -152,7 +283,7 @@ private void initializeDialog(boolean isEditingTask) {

// Disallow save if form content is invalid
dialog.getDialogPane().lookupButton(buttonTypeOk).addEventFilter(ActionEvent.ACTION, event -> {
if (!areFieldsValid()) {
if (!validateFields()) {
event.consume();
}
});
Expand All @@ -167,16 +298,10 @@ private void initializeDialog(boolean isEditingTask) {
});
}

private boolean areFieldsValid() {
if (title.getText().isBlank()) {
titleErrorLabel.setVisible(true);
titleErrorLabel.setManaged(true);
return false;
} else {
titleErrorLabel.setVisible(false);
titleErrorLabel.setManaged(false);
return true;
}
private boolean validateFields() {
boolean isTitleValid = !title.getText().isBlank();
titleErrorLabel.setVisible(!isTitleValid);
return isTitleValid;
}

public Dialog<Task> getDialog() {
Expand All @@ -187,10 +312,10 @@ private Task getTask() {
return new Task(
title.getText(),
Optional.of(description.getText()).filter(text -> !text.isBlank()).orElse(null),
Optional.of(timestamp.getText()).filter(text -> !text.isBlank()).map(Timestamp::tryParse).orElse(null),
Optional.ofNullable(timestamp.getValue()).map(Timestamp::of).orElse(null),
tags,
isDone.isSelected(),
new HashSet<>()
contacts
);
}
}
Loading

0 comments on commit 8ce1403

Please sign in to comment.