diff --git a/src/main/java/seedu/us/among/logic/parser/FindCommandParser.java b/src/main/java/seedu/us/among/logic/parser/FindCommandParser.java index 148cae6144c..9bd61d57f0b 100644 --- a/src/main/java/seedu/us/among/logic/parser/FindCommandParser.java +++ b/src/main/java/seedu/us/among/logic/parser/FindCommandParser.java @@ -40,6 +40,7 @@ public FindCommand parse(String args) throws ParseException { String[] nameKeywords; + //to-do jun xiong update this to use swtich case? or find a better way to do this if (argMultimap.arePrefixesPresent(PREFIX_METHOD)) { String input = argMultimap.getValue(PREFIX_METHOD).get(); nameKeywords = getNameKeywords(input); diff --git a/src/main/java/seedu/us/among/ui/ResultDisplay.java b/src/main/java/seedu/us/among/ui/ResultDisplay.java index 6e704fb73c6..6b1366a58cc 100644 --- a/src/main/java/seedu/us/among/ui/ResultDisplay.java +++ b/src/main/java/seedu/us/among/ui/ResultDisplay.java @@ -30,12 +30,12 @@ public class ResultDisplay extends UiPart { private ImageView loadingSpinnerPlaceholder; @FXML private ImageView errorPlaceholder; - @FXML - private ImageView backgroundPlaceholder; + // @FXML + // private ImageView backgroundPlaceholder; private Timeline errorGifTimeline; - private final Image background = new Image(this.getClass().getResourceAsStream("/images/background.png")); + // private final Image background = new Image(this.getClass().getResourceAsStream("/images/background.png")); private final Image loadingSpinner = new Image(this.getClass().getResourceAsStream("/images/loading_spinner.gif")); private final Image error = new Image(this.getClass().getResourceAsStream("/images/error.gif")); @@ -46,7 +46,7 @@ public ResultDisplay() { super(FXML); this.loadingSpinnerPlaceholder.setImage(loadingSpinner); this.errorPlaceholder.setImage(error); - this.backgroundPlaceholder.setImage(background); + // this.backgroundPlaceholder.setImage(background); // Set timeline for error message this.errorGifTimeline = new Timeline( new KeyFrame(Duration.ZERO, x -> this.getErrorPlaceholder().setVisible(true)), diff --git a/src/main/java/seedu/us/among/ui/ThemeType.java b/src/main/java/seedu/us/among/ui/ThemeType.java index 2fa642f773c..879cef226bf 100644 --- a/src/main/java/seedu/us/among/ui/ThemeType.java +++ b/src/main/java/seedu/us/among/ui/ThemeType.java @@ -6,7 +6,7 @@ //Solution below adapted from //https://www.stubbornjava.com/posts/java-enum-lookup-by-name-or-field-without-throwing-exceptions public enum ThemeType { - LIGHT, DARK; + LIGHT, DARK, IMPOSTER; private static final Map themeIndex = new HashMap<>(); diff --git a/src/main/resources/images/BackgourndImposter.png b/src/main/resources/images/BackgourndImposter.png new file mode 100644 index 00000000000..410c675bc4b Binary files /dev/null and b/src/main/resources/images/BackgourndImposter.png differ diff --git a/src/main/resources/images/BackgroundDark.png b/src/main/resources/images/BackgroundDark.png new file mode 100644 index 00000000000..038e8e66db8 Binary files /dev/null and b/src/main/resources/images/BackgroundDark.png differ diff --git a/src/main/resources/images/BackgroundLight.png b/src/main/resources/images/BackgroundLight.png new file mode 100644 index 00000000000..452e4338576 Binary files /dev/null and b/src/main/resources/images/BackgroundLight.png differ diff --git a/src/main/resources/images/background2.png b/src/main/resources/images/background2.png new file mode 100644 index 00000000000..410c675bc4b Binary files /dev/null and b/src/main/resources/images/background2.png differ diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css index e7ec26385cb..4d672ce74d3 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/DarkTheme.css @@ -337,6 +337,7 @@ } #resultDisplay .content { + -fx-background-image: url('/images/BackgourndDark.png'); -fx-background-color: transparent, #383838, transparent, #383838; -fx-background-radius: 0; } diff --git a/src/main/resources/view/ImposterTheme.css b/src/main/resources/view/ImposterTheme.css new file mode 100644 index 00000000000..0513d91db1c --- /dev/null +++ b/src/main/resources/view/ImposterTheme.css @@ -0,0 +1,377 @@ +.background { + -fx-background-color: derive(#000000, 20%); + -fx-background-image: url('/images/background.png'); + background-color: #383838; /* Used in the default.html file */ +} + +.label { + -fx-font-size: 11pt; + -fx-font-family: "Segoe UI Semibold"; + -fx-text-fill: #555555; + -fx-opacity: 0.9; +} + +.label-bright { + -fx-font-size: 11pt; + -fx-font-family: "Segoe UI Semibold"; + -fx-text-fill: white; + -fx-opacity: 1; +} + +.label-header { + -fx-font-size: 32pt; + -fx-font-family: "Segoe UI Light"; + -fx-text-fill: white; + -fx-opacity: 1; +} + +.text-field { + -fx-font-size: 12pt; + -fx-font-family: "Segoe UI Semibold"; +} + +.tab-pane { + -fx-padding: 0 0 0 1; +} + +.tab-pane .tab-header-area { + -fx-padding: 0 0 0 0; + -fx-min-height: 0; + -fx-max-height: 0; +} + +.table-view { + -fx-base: #000000; + -fx-control-inner-background: #000000; + -fx-background-color: #000000; + -fx-table-cell-border-color: transparent; + -fx-table-header-border-color: transparent; + -fx-padding: 5; +} + +.table-view .column-header-background { + -fx-background-color: transparent; +} + +.table-view .column-header, .table-view .filler { + -fx-size: 35; + -fx-border-width: 0 0 1 0; + -fx-background-color: transparent; + -fx-border-color: + transparent + transparent + derive(-fx-base, 80%) + transparent; + -fx-border-insets: 0 10 1 0; +} + +.table-view .column-header .label { + -fx-font-size: 20pt; + -fx-font-family: "Segoe UI Light"; + -fx-text-fill: white; + -fx-alignment: center-left; + -fx-opacity: 1; +} + +.table-view:focused .table-row-cell:filled:focused:selected { + -fx-background-color: -fx-focus-color; +} + +.split-pane:horizontal .split-pane-divider { + -fx-background-color: derive(#000000, 20%); + -fx-border-color: transparent transparent transparent #4d4d4d; +} + +.split-pane { + -fx-border-radius: 1; + -fx-border-width: 1; + -fx-background-color: derive(#000000, 20%); +} + +.list-view { + -fx-background-insets: 0; + -fx-padding: 0; + -fx-background-color: derive(#000000, 20%); +} + +.list-cell { + -fx-label-padding: 0 0 0 0; + -fx-graphic-text-gap : 0; + -fx-padding: 0 0 0 0; +} + +.list-cell:filled:even { + -fx-background-color: #292929; +} + +.list-cell:filled:odd { + -fx-background-color: #945929; +} + +.list-cell:filled:selected { + -fx-background-color: #424d5f; +} + +.list-cell:filled:selected #cardPane { + -fx-border-color: #3e7b91; + -fx-border-width: 1; +} + +.list-cell .label { + -fx-text-fill: white; +} + +.cell_big_label { + -fx-font-family: "Segoe UI Semibold"; + -fx-font-size: 16px; + -fx-text-fill: #ff9408; +} + +.cell_small_label { + -fx-font-family: "Segoe UI"; + -fx-font-size: 13px; + -fx-text-fill: #ff9408; +} + +.stack-pane { + -fx-background-color: derive(#000000, 20%); +} + +.pane-with-border { + -fx-background-color: derive(#000000, 20%); + -fx-border-color: derive(#000000, 10%); + -fx-border-top-width: 1px; +} + +.status-bar { + -fx-background-color: derive(#000000, 30%); +} + +.result-background { + -fx-opacity: 0.3; +} + +.result-display { + -fx-background-color: transparent; + -fx-font-family: "Segoe UI"; + -fx-font-size: 13pt; + -fx-text-fill: rgb(219, 219, 219); +} + +.result-display .label { + -fx-text-fill: black !important; + +} + +.status-bar .label { + -fx-text-fill: white; + -fx-font-family: "Segoe UI Light"; + -fx-padding: 4px; + -fx-pref-height: 30px; +} + +.status-bar-with-border { + -fx-background-color: derive(#000000, 30%); + -fx-border-color: derive(#000000, 25%); + -fx-border-width: 1px; +} + +.status-bar-with-border .label { + -fx-text-fill: white; +} + +.grid-pane { + -fx-background-color: derive(#000000, 50%); + -fx-border-color: derive(#000000, 50%); + -fx-border-width: 1px; +} + +.grid-pane .stack-pane { + -fx-background-color: derive(#000000, 50%); +} + +.context-menu { + -fx-background-color: derive(#000000, 100%); +} + +.context-menu .label { + -fx-text-fill: white; +} + +.menu-bar { + -fx-background-color: derive(#000000, 50%); +} + +.menu-bar .label { + -fx-font-size: 14pt; + -fx-font-family: "Segoe UI Light"; + -fx-text-fill: white; + -fx-opacity: 0.9; +} + +.menu .left-container { + -fx-background-color: black; +} + +/* + * Metro style Push Button + * Author: Pedro Duque Vieira + * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/ + */ +.button { + -fx-padding: 5 22 5 22; + -fx-border-color: #e2e2e2; + -fx-border-width: 2; + -fx-background-radius: 0; + -fx-background-color: #000000; + -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif; + -fx-font-size: 11pt; + -fx-text-fill: #d8d8d8; + -fx-background-insets: 0 0 0 0, 0, 1, 2; +} + +.button:hover { + -fx-background-color: #3a3a3a; +} + +.button:pressed, .button:default:hover:pressed { + -fx-background-color: white; + -fx-text-fill: #000000; +} + +.button:focused { + -fx-border-color: white, white; + -fx-border-width: 1, 1; + -fx-border-style: solid, segments(1, 1); + -fx-border-radius: 0, 0; + -fx-border-insets: 1 1 1 1, 0; +} + +.button:disabled, .button:default:disabled { + -fx-opacity: 0.4; + -fx-background-color: #000000; + -fx-text-fill: white; +} + +.button:default { + -fx-background-color: -fx-focus-color; + -fx-text-fill: #ffffff; +} + +.button:default:hover { + -fx-background-color: derive(-fx-focus-color, 30%); +} + +.dialog-pane { + -fx-background-color: #000000; +} + +.dialog-pane > *.button-bar > *.container { + -fx-background-color: #000000; +} + +.dialog-pane > *.label.content { + -fx-font-size: 14px; + -fx-font-weight: bold; + -fx-text-fill: white; +} + +.dialog-pane:header *.header-panel { + -fx-background-color: derive(#000000, 25%); +} + +.dialog-pane:header *.header-panel *.label { + -fx-font-size: 18px; + -fx-font-style: italic; + -fx-fill: white; + -fx-text-fill: white; +} + +.scroll-bar { + -fx-background-color: derive(#000000, 20%); +} + +.scroll-bar .thumb { + -fx-background-color: derive(#000000, 50%); + -fx-background-insets: 3; +} + +.scroll-bar .increment-button, .scroll-bar .decrement-button { + -fx-background-color: transparent; + -fx-padding: 0 0 0 0; +} + +.scroll-bar .increment-arrow, .scroll-bar .decrement-arrow { + -fx-shape: " "; +} + +.scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .decrement-arrow { + -fx-padding: 1 8 1 8; +} + +.scroll-bar:horizontal .increment-arrow, .scroll-bar:horizontal .decrement-arrow { + -fx-padding: 8 1 8 1; +} + +#cardPane { + -fx-background-color: transparent; + -fx-border-width: 0; +} + +#commandTypeLabel { + -fx-font-size: 11px; + -fx-text-fill: #F70D1A; +} + +#commandTextField { + -fx-background-color: transparent #383838 transparent #383838; + -fx-background-insets: 0; + -fx-border-color: #383838 #383838 #ffffff #383838; + -fx-border-insets: 0; + -fx-border-width: 1; + -fx-font-family: "Segoe UI Light"; + -fx-font-size: 13pt; + -fx-text-fill: white; +} + +#filterField, #personListPanel, #personWebpage { + -fx-effect: innershadow(gaussian, black, 10, 0, 0, 0); +} + +#resultDisplay .content { + -fx-background-image: url('/images/BackgourndImposter.png'); + -fx-opacity: 0.95; + -fx-background-color: transparent, #945929, transparent, #945929; + -fx-background-radius: 0; +} + +#tags { + -fx-hgap: 7; + -fx-vgap: 3; +} + +#tags .label { + -fx-text-fill: white; + -fx-background-color: #3e7b91; + -fx-padding: 1 3 1 3; + -fx-border-radius: 2; + -fx-background-radius: 2; + -fx-font-size: 11; +} + +#responseMeta { + -fx-hgap: 7; + -fx-vgap: 3; +} + +#responseMeta .label { + -fx-text-fill: white; + -fx-padding: 1 3 1 3; + -fx-border-radius: 2; + -fx-background-radius: 2; + -fx-font-size: 11; + -fx-z-index: -1; + +} + + diff --git a/src/main/resources/view/LightTheme.css b/src/main/resources/view/LightTheme.css index da5b4496b1d..a1e3cd39598 100644 --- a/src/main/resources/view/LightTheme.css +++ b/src/main/resources/view/LightTheme.css @@ -148,7 +148,7 @@ .result-display { -fx-background-color: transparent; - -fx-font-family: "Segoe UI Light"; + -fx-font-family: "Segoe UI"; -fx-font-size: 13pt; -fx-text-fill: black; } @@ -333,7 +333,8 @@ } #resultDisplay .content { - -fx-background-color: transparent, #D3D3D3, transparent, #D3D3D3; + -fx-background-image: url('/images/BackgroundLight.png'); + -fx-background-color: #D3D3D3; -fx-background-radius: 0; } diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index 93bafcca70c..46a28a7713c 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -20,7 +20,7 @@ - + diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml index 0324f6582f0..75fb0596092 100644 --- a/src/main/resources/view/ResultDisplay.fxml +++ b/src/main/resources/view/ResultDisplay.fxml @@ -13,8 +13,8 @@