Skip to content

Commit ec49d60

Browse files
alex-setyawanalex-setyawan
committed
Merge branch 'backup' into messages
2 parents e9e581d + 933ee3b commit ec49d60

File tree

6 files changed

+57
-55
lines changed

6 files changed

+57
-55
lines changed

‎src/main/java/seedu/address/logic/Messages.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ public static String format(Person person) {
6363
.append("Diagnosis: ")
6464
.append(Optional.ofNullable(person.getDiagnosis()).map(Object::toString).orElse("-")).append("\n")
6565
.append("Symptom: ")
66-
.append(Optional.ofNullable(person.getSymptom()).map(Object::toString).orElse("-")).append("\n")
67-
.append("Tags: ");
68-
person.getTags().forEach(builder::append);
66+
.append(Optional.ofNullable(person.getSymptom()).map(Object::toString).orElse("-")).append("\n");
6967
return builder.toString();
7068
}
7169

‎src/main/java/seedu/address/ui/PersonCard.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
public class PersonCard extends UiPart<Region> {
1616

1717
private static final String FXML = "PersonListCard.fxml";
18+
private static final Color customGreen = Color.web("#81C784");
19+
private static final Color customYellow = Color.web("#FFF176");
20+
private static final Color customRed = Color.web("#EF5350");
21+
1822

1923
/**
2024
* Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
@@ -57,16 +61,16 @@ public PersonCard(Person person, int displayedIndex) {
5761
public void updateStatusCircle(Status status) {
5862
switch (status.getStatusType()) {
5963
case HEALTHY:
60-
statusCircle.setFill(Color.GREEN);
61-
statusCircle.setStroke(Color.GREEN);
64+
statusCircle.setFill(customGreen);
65+
statusCircle.setStroke(customGreen);
6266
break;
6367
case UNWELL:
64-
statusCircle.setFill(Color.RED);
65-
statusCircle.setStroke(Color.RED);
68+
statusCircle.setFill(customRed);
69+
statusCircle.setStroke(customRed);
6670
break;
6771
case PENDING:
68-
statusCircle.setFill(Color.YELLOW);
69-
statusCircle.setStroke(Color.YELLOW);
72+
statusCircle.setFill(customYellow);
73+
statusCircle.setStroke(customYellow);
7074
break;
7175
default:
7276
statusCircle.setFill(Color.GREY);

‎src/main/resources/view/CommandBox.fxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<?import javafx.scene.image.Image?>
99
<?import javafx.geometry.Insets?>
1010
<StackPane styleClass="pane-with-border" prefHeight="60" xmlns="http://javafx.com/javafx/17"
11-
xmlns:fx="http://javafx.com/fxml/1" style="-fx-background-color: #818589;">
11+
xmlns:fx="http://javafx.com/fxml/1" style="-fx-background-color: #a7b0ae;">
1212
<HBox alignment="CENTER_LEFT" spacing="5">
1313
<ImageView fitWidth="25" fitHeight="25">
1414
<Image url="@/images/search_icon.png"/>
1515
</ImageView>
1616
<TextField fx:id="commandTextField" prefHeight="45" HBox.hgrow="ALWAYS" onAction="#handleCommandEntered"
17-
promptText="Input command here..." style="-fx-background-color: transparent; -fx-border-color: #818589;" />
17+
promptText="Input command here..." style="-fx-background-color: transparent; -fx-border-color: #a7b0ae;" />
1818
</HBox>
1919
<padding>
2020
<Insets bottom="5" left="10" right="10" top="5" />

‎src/main/resources/view/DarkTheme.css

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.background {
2-
-fx-background-color: derive(#1d1d1d, 20%);
3-
background-color: #383838; /* Used in the default.html file */
2+
-fx-background-color: derive(#b9c4c0, 20%);
3+
background-color: #b9c4c0; /* Used in the default.html file */
44
}
55

66
.label {
@@ -40,9 +40,9 @@
4040
}
4141

4242
.table-view {
43-
-fx-base: #1d1d1d;
44-
-fx-control-inner-background: #1d1d1d;
45-
-fx-background-color: #1d1d1d;
43+
-fx-base: #b9c4c0;
44+
-fx-control-inner-background: #b9c4c0;
45+
-fx-background-color: #b9c4c0;
4646
-fx-table-cell-border-color: transparent;
4747
-fx-table-header-border-color: transparent;
4848
-fx-padding: 5;
@@ -77,20 +77,20 @@
7777
}
7878

7979
.split-pane:horizontal .split-pane-divider {
80-
-fx-background-color: derive(#1d1d1d, 20%);
81-
-fx-border-color: transparent transparent transparent #4d4d4d;
80+
-fx-background-color: derive(#b9c4c0, 20%);
81+
-fx-border-color: transparent transparent transparent #b9c4c0;
8282
}
8383

8484
.split-pane {
8585
-fx-border-radius: 1;
8686
-fx-border-width: 1;
87-
-fx-background-color: derive(#1d1d1d, 20%);
87+
-fx-background-color: derive(#b9c4c0, 20%);
8888
}
8989

9090
.list-view {
9191
-fx-background-insets: 0;
9292
-fx-padding: 0;
93-
-fx-background-color: derive(#1d1d1d, 20%);
93+
-fx-background-color: derive(#b9c4c0, 20%);
9494
}
9595

9696
.list-cell {
@@ -100,57 +100,57 @@
100100
}
101101

102102
.list-cell:filled:even {
103-
-fx-background-color: #3c3e3f;
103+
-fx-background-color: #ebf2ef;
104104
}
105105

106106
.list-cell:filled:odd {
107-
-fx-background-color: #515658;
107+
-fx-background-color: #dee3e1;
108108
}
109109

110110
.list-cell:filled:selected {
111-
-fx-background-color: #424d5f;
111+
-fx-background-color: #97b0a5;
112112
}
113113

114114
.list-cell:filled:selected #cardPane {
115-
-fx-border-color: #3e7b91;
115+
-fx-border-color: #b9c4c0;
116116
-fx-border-width: 1;
117117
}
118118

119119
.list-cell .label {
120-
-fx-text-fill: white;
120+
-fx-text-fill: #676767;
121121
}
122122

123123
.cell_big_label {
124-
-fx-font-family: "Segoe UI Semibold";
124+
-fx-font-family: "Segoe UI Bold";
125125
-fx-font-size: 16px;
126-
-fx-text-fill: #010504;
126+
-fx-text-fill: #676767;
127127
}
128128

129129
.cell_small_label {
130130
-fx-font-family: "Segoe UI";
131131
-fx-font-size: 13px;
132-
-fx-text-fill: #010504;
132+
-fx-text-fill: #676767;
133133
}
134134

135135
.stack-pane {
136-
-fx-background-color: derive(#1d1d1d, 20%);
136+
-fx-background-color: derive(#b9c4c0, 20%);
137137
}
138138

139139
.pane-with-border {
140-
-fx-background-color: derive(#1d1d1d, 20%);
141-
-fx-border-color: derive(#1d1d1d, 10%);
140+
-fx-background-color: derive(#b9c4c0, 20%);
141+
-fx-border-color: derive(#b9c4c0, 10%);
142142
-fx-border-top-width: 1px;
143143
}
144144

145145
.status-bar {
146-
-fx-background-color: derive(#1d1d1d, 30%);
146+
-fx-background-color: derive(#469073, 30%);
147147
}
148148

149149
.result-panel {
150-
-fx-background-color: transparent;
150+
-fx-background-color: #a7b0ae;
151151
-fx-font-family: "Segoe UI Light";
152-
-fx-font-size: 13pt;
153-
-fx-text-fill: white;
152+
-fx-font-size: 15pt;
153+
-fx-text-fill: #424242;
154154
}
155155

156156
.result-panel .label {
@@ -165,8 +165,8 @@
165165
}
166166

167167
.status-bar-with-border {
168-
-fx-background-color: derive(#1d1d1d, 30%);
169-
-fx-border-color: derive(#1d1d1d, 25%);
168+
-fx-background-color: derive(#469073, 30%);
169+
-fx-border-color: derive(#469073, 25%);
170170
-fx-border-width: 1px;
171171
}
172172

@@ -175,25 +175,25 @@
175175
}
176176

177177
.grid-pane {
178-
-fx-background-color: derive(#1d1d1d, 30%);
179-
-fx-border-color: derive(#1d1d1d, 30%);
178+
-fx-background-color: derive(#b9c4c0, 30%);
179+
-fx-border-color: derive(#b9c4c0, 30%);
180180
-fx-border-width: 1px;
181181
}
182182

183183
.grid-pane .stack-pane {
184-
-fx-background-color: derive(#1d1d1d, 30%);
184+
-fx-background-color: derive(#b9c4c0, 30%);
185185
}
186186

187187
.context-menu {
188-
-fx-background-color: derive(#1d1d1d, 50%);
188+
-fx-background-color: derive(#b9c4c0, 50%);
189189
}
190190

191191
.context-menu .label {
192192
-fx-text-fill: white;
193193
}
194194

195195
.menu-bar {
196-
-fx-background-color: derive(#1d1d1d, 20%);
196+
-fx-background-color: derive(#b9c4c0, 20%);
197197
}
198198

199199
.menu-bar .label {
@@ -204,7 +204,7 @@
204204
}
205205

206206
.menu .left-container {
207-
-fx-background-color: black;
207+
-fx-background-color: #b9c4c0;
208208
}
209209

210210
/*
@@ -217,10 +217,10 @@
217217
-fx-border-color: #e2e2e2;
218218
-fx-border-width: 2;
219219
-fx-background-radius: 0;
220-
-fx-background-color: #1d1d1d;
220+
-fx-background-color: #b9c4c0;
221221
-fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
222222
-fx-font-size: 11pt;
223-
-fx-text-fill: #d8d8d8;
223+
-fx-text-fill: #676767;
224224
-fx-background-insets: 0 0 0 0, 0, 1, 2;
225225
}
226226

@@ -243,7 +243,7 @@
243243

244244
.button:disabled, .button:default:disabled {
245245
-fx-opacity: 0.4;
246-
-fx-background-color: #1d1d1d;
246+
-fx-background-color: #b9c4c0;
247247
-fx-text-fill: white;
248248
}
249249

@@ -257,11 +257,11 @@
257257
}
258258

259259
.dialog-pane {
260-
-fx-background-color: #1d1d1d;
260+
-fx-background-color: #FDFFFE;
261261
}
262262

263263
.dialog-pane > *.button-bar > *.container {
264-
-fx-background-color: #1d1d1d;
264+
-fx-background-color: #b9c4c0;
265265
}
266266

267267
.dialog-pane > *.label.content {
@@ -271,7 +271,7 @@
271271
}
272272

273273
.dialog-pane:header *.header-panel {
274-
-fx-background-color: derive(#1d1d1d, 25%);
274+
-fx-background-color: derive(#b9c4c0, 25%);
275275
}
276276

277277
.dialog-pane:header *.header-panel *.label {
@@ -282,11 +282,11 @@
282282
}
283283

284284
.scroll-bar {
285-
-fx-background-color: derive(#1d1d1d, 20%);
285+
-fx-background-color: derive(#fdfffe, 20%);
286286
}
287287

288288
.scroll-bar .thumb {
289-
-fx-background-color: derive(#1d1d1d, 50%);
289+
-fx-background-color: derive(#b9c4c0, 50%);
290290
-fx-background-insets: 3;
291291
}
292292

@@ -314,7 +314,7 @@
314314

315315
#commandTypeLabel {
316316
-fx-font-size: 11px;
317-
-fx-text-fill: #F70D1A;
317+
-fx-text-fill: #676767;
318318
}
319319

320320
#commandTextField {
@@ -333,7 +333,7 @@
333333
}
334334

335335
#resultPanel .content {
336-
-fx-background-color: transparent, #383838, transparent, #383838;
336+
-fx-background-color: #a7b0ae, #a7b0ae, #a7b0ae, #a7b0ae;
337337
-fx-background-radius: 0;
338338
}
339339

‎src/main/resources/view/Extensions.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
.list-cell:empty {
77
/* Empty cells will not have alternating colours */
8-
-fx-background: #383838;
8+
-fx-background: #FDFFFE;
99
}
1010

1111
.tag-selector {

‎src/main/resources/view/MainWindow.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</stylesheets>
2626

2727
<VBox>
28-
<MenuBar fx:id="menuBar" style="-fx-background-color: #2FAD66;" VBox.vgrow="NEVER">
28+
<MenuBar fx:id="menuBar" style="-fx-background-color: #469073;" VBox.vgrow="NEVER">
2929
<Menu mnemonicParsing="false" text="Help" style="-fx-font-family: Arial; -fx-font-size: 14px;">
3030
<MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" style="-fx-font-family: Arial; -fx-font-size: 14px;" />
3131
</Menu>

0 commit comments

Comments
 (0)