From 5efb51f50c68de14e43a5a885ef4db7bb811e648 Mon Sep 17 00:00:00 2001 From: amrut-prabhu Date: Wed, 11 Apr 2018 14:38:30 +0800 Subject: [PATCH] Fix merges --- src/main/java/seedu/club/MainApp.java | 2 +- src/main/java/seedu/club/ui/MemberOverviewPanel.java | 6 +++--- src/main/resources/view/DarkTheme.css | 4 ++-- src/test/java/systemtests/ClubBookSystemTest.java | 2 -- src/test/java/systemtests/DeleteCommandSystemTest.java | 1 - src/test/java/systemtests/DeleteTaskCommandSystemTest.java | 1 - src/test/java/systemtests/SelectCommandSystemTest.java | 1 - 7 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/seedu/club/MainApp.java b/src/main/java/seedu/club/MainApp.java index 15addff21a15..94acfc85b370 100644 --- a/src/main/java/seedu/club/MainApp.java +++ b/src/main/java/seedu/club/MainApp.java @@ -42,7 +42,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(1, 4, 0, true); + public static final Version VERSION = new Version(1, 5, 0, true); private static final Logger logger = LogsCenter.getLogger(MainApp.class); diff --git a/src/main/java/seedu/club/ui/MemberOverviewPanel.java b/src/main/java/seedu/club/ui/MemberOverviewPanel.java index c94428ae7a2e..e5f50dfe2e52 100644 --- a/src/main/java/seedu/club/ui/MemberOverviewPanel.java +++ b/src/main/java/seedu/club/ui/MemberOverviewPanel.java @@ -226,13 +226,13 @@ private void loadMemberPage(Member member) { group.setText(member.getGroup().groupName); group.setAlignment(Pos.CENTER); createTags(member); - setIcons(); + //setIcons(); } /** * Set Icon pictures */ - private void setIcons() { + /*private void setIcons() { Image phoneImg; Image emailImg; phoneImg = new Image(MainApp.class.getResourceAsStream(PHONE_ICON), @@ -241,7 +241,7 @@ private void setIcons() { emailImg = new Image(MainApp.class.getResourceAsStream(EMAIL_ICON), 21, 21, false, true); emailIcon.setImage(emailImg); - } + }*/ //@@author //@@author yash-chowdhary diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css index ab34526c264c..09d7cd4b9104 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/DarkTheme.css @@ -146,7 +146,7 @@ .cell_big_label { -fx-font-family: "Segoe UI Semibold"; -fx-font-size: 18px; - -fx-text-fill: white; + -fx-text-fill: #010504; } .cell_small_label { @@ -158,7 +158,7 @@ .cell_medium_label { -fx-font-family: "Segoe UI"; -fx-font-size: 20px; - -fx-text-fill: #ffffff; + -fx-text-fill: #000000; } .anchor-pane { diff --git a/src/test/java/systemtests/ClubBookSystemTest.java b/src/test/java/systemtests/ClubBookSystemTest.java index a82bbd5bfbea..b64cf9b063db 100644 --- a/src/test/java/systemtests/ClubBookSystemTest.java +++ b/src/test/java/systemtests/ClubBookSystemTest.java @@ -10,8 +10,6 @@ import static seedu.club.ui.testutil.GuiTestAssert.assertListMatching; import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/test/java/systemtests/DeleteCommandSystemTest.java b/src/test/java/systemtests/DeleteCommandSystemTest.java index ac55ce1e0658..905152f5ebcf 100644 --- a/src/test/java/systemtests/DeleteCommandSystemTest.java +++ b/src/test/java/systemtests/DeleteCommandSystemTest.java @@ -177,7 +177,6 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex * Performs the same verification as {@code assertCommandSuccess(String, Model, String)} except that the browser url * and selected card are expected to update accordingly depending on the card at {@code expectedSelectedCardIndex}. * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String) - * @see ClubBookSystemTest#assertSelectedCardChanged(Index) */ private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage, Index expectedSelectedCardIndex) { diff --git a/src/test/java/systemtests/DeleteTaskCommandSystemTest.java b/src/test/java/systemtests/DeleteTaskCommandSystemTest.java index 02de771bbc2f..d714f63f2fd6 100644 --- a/src/test/java/systemtests/DeleteTaskCommandSystemTest.java +++ b/src/test/java/systemtests/DeleteTaskCommandSystemTest.java @@ -103,7 +103,6 @@ private void assertCommandSuccess(String command, Model expectedModel, String ex * Performs the same verification as {@code assertCommandSuccess(String, Model, String)} except that the browser url * and selected card are expected to update accordingly depending on the card at {@code expectedSelectedCardIndex}. * @see DeleteCommandSystemTest#assertCommandSuccess(String, Model, String) - * @see ClubBookSystemTest#assertSelectedCardChanged(Index) */ private void assertCommandSuccess(String command, Model expectedModel, String expectedResultMessage, Index expectedSelectedCardIndex) { diff --git a/src/test/java/systemtests/SelectCommandSystemTest.java b/src/test/java/systemtests/SelectCommandSystemTest.java index a4e98036a26b..c6536bb085e7 100644 --- a/src/test/java/systemtests/SelectCommandSystemTest.java +++ b/src/test/java/systemtests/SelectCommandSystemTest.java @@ -118,7 +118,6 @@ public void select() { * Verifications 1, 3 and 4 are performed by * {@code ClubBookSystemTest#assertApplicationDisplaysExpected(String, String, Model)}.
* @see ClubBookSystemTest#assertApplicationDisplaysExpected(String, String, Model) - * @see ClubBookSystemTest#assertSelectedCardChanged(Index) */ private void assertCommandSuccess(String command, Index expectedSelectedCardIndex) { Model expectedModel = getModel();