diff --git a/src/main/java/app/nush/examclock/controllers/AddExamController.java b/src/main/java/app/nush/examclock/controllers/AddExamController.java index e8978ef..0fe5845 100644 --- a/src/main/java/app/nush/examclock/controllers/AddExamController.java +++ b/src/main/java/app/nush/examclock/controllers/AddExamController.java @@ -14,6 +14,7 @@ import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; import java.time.temporal.ChronoUnit; @@ -24,17 +25,17 @@ public class AddExamController { /** * The constant dateFormatter used for date picker (user friendly, shows jan feb etc) */ - public static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy MMM dd"); + public static final DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("yyyy MMM dd").toFormatter(); /** * The time formatters that will be supported by start and end fields */ public static final DateTimeFormatter[] timeFormatters = { - DateTimeFormatter.ofPattern("hh:mma"), - DateTimeFormatter.ofPattern("HH:mm"), - DateTimeFormatter.ofPattern("h:mma"), - DateTimeFormatter.ofPattern("H:mm"), - DateTimeFormatter.ofPattern("hha"), - DateTimeFormatter.ofPattern("ha") + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("hh:mma").toFormatter(), + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("HH:mm").toFormatter(), + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("h:mma").toFormatter(), + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("H:mm").toFormatter(), + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("hha").toFormatter(), + new DateTimeFormatterBuilder().parseCaseInsensitive().appendPattern("ha").toFormatter() }; public Form form; @@ -96,7 +97,7 @@ public LocalDate fromString(String dateString) { @FXML public void addExam(ActionEvent event) { try { - Exam exam = new Exam(name_input.getText(), date_input.getValue(), parseTime(start_time_input.getText().toLowerCase(), 0), parseTime(end_time_input.getText().toLowerCase(), 0)); + Exam exam = new Exam(name_input.getText(), date_input.getValue(), parseTime(start_time_input.getText(), 0), parseTime(end_time_input.getText(), 0)); mainController.addExam(exam); } catch (Exception e) { Alert alert = new Alert(Alert.AlertType.ERROR, e.getMessage()); diff --git a/src/main/java/app/nush/examclock/display/TimePicker.java b/src/main/java/app/nush/examclock/display/TimePicker.java index 51a6def..77372c2 100644 --- a/src/main/java/app/nush/examclock/display/TimePicker.java +++ b/src/main/java/app/nush/examclock/display/TimePicker.java @@ -8,11 +8,16 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; import static app.nush.examclock.controllers.AddExamController.parseTime; public class TimePicker extends TextField { - public static final DateTimeFormatter defaultFormatter = DateTimeFormatter.ofPattern("hh:mm a"); + public static final DateTimeFormatter defaultFormatter = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .appendPattern("hh:mm a") + .toFormatter(); + private final TimePopup popup; public SimpleObjectProperty timeProperty; public SimpleIntegerProperty hour; diff --git a/src/main/resources/theme.css b/src/main/resources/theme.css index 17a19aa..733cfc7 100644 --- a/src/main/resources/theme.css +++ b/src/main/resources/theme.css @@ -27,13 +27,19 @@ } .list-item { - -fx-fill: white; - -fx-text-fill: -fx-fill; + -fx-background-color: -fx-control-inner-background; +} + +.list-item * { + -fx-fill: -fx-foreground; +} + +.list-item:hover { + -fx-background: -fx-background; } -.list-item .text { - -fx-fill: white; - -fx-text-fill: -fx-fill; +.list-item:active { + -fx-background: -fx-accent; }