Merge pull request #219 from amrut-prabhu/theme

Change Theme of app
CS2103JAN2018-W15-B4 · Apr 11, 2018 · e3eade7 · e3eade7
2 parents 5ab38ff + 5efb51f
commit e3eade7
Show file tree

Hide file tree

Showing 27 changed files with 141 additions and 131 deletions.
diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
@@ -1,5 +1,4 @@
 = Club Connect - User Guide
-[.text-center]
 :toc:
 :toc-title:
 :toc-placement: preamble

diff --git 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/commons/core/Messages.java b/src/main/java/seedu/club/commons/core/Messages.java
@@ -10,16 +10,14 @@ public class Messages {
     public static final String MESSAGE_INVALID_MEMBER_FORMAT = "Invalid member format! \n%1$s";
     public static final String MESSAGE_INVALID_MEMBER_DISPLAYED_INDEX = "The member index provided is invalid.";
     public static final String MESSAGE_INVALID_TASK_DISPLAYED_INDEX = "The task index provided is invalid.";
-    public static final String MESSAGE_MEMBERS_LISTED_OVERVIEW = "%1$d members listed!";
+    public static final String MESSAGE_MEMBERS_LISTED_OVERVIEW = "%1$d members listed.";
     public static final String MESSAGE_NON_EXISTENT_GROUP = "The group \'%1$s\' does not exist in the Club Book.";
     public static final String MESSAGE_MANDATORY_GROUP = "The group \'%1$s\' cannot be deleted as "
             + "it is a mandatory group.";
-    public static final String MESSAGE_INVALID_POLL_DISPLAYED_INDEX = "The poll index provided is invalid";
+    public static final String MESSAGE_INVALID_POLL_DISPLAYED_INDEX = "The poll index provided is invalid.";
     public static final String MESSAGE_INVALID_ANSWER_DISPLAYED_INDEX = "The answer index provided is invalid.";
-    public static final String MESSAGE_INVALID_PHOTO_PATH = "Unable to read profile photo from the path: %1$s";
-    public static final String MESSAGE_SAME_PHOTO_PATH = "Profile photo path entered is same as the current photo";
-    public static final String MESSAGE_REQUIRE_LOG_IN = "Please log in to Club Connect.";
-    public static final String MESSAGE_REQUIRE_SIGN_UP = "Please sign up to use Club Connect";
-    public static final String MESSAGE_REQUIRE_EXCO_LOG_IN = "You need to be an exco to use these features";
-    public static final String MESSAGE_REQUIRE_LOG_OUT = "Please logout before using the login feature";
+    public static final String MESSAGE_REQUIRE_LOG_IN = "Please log in to Club Connect to use this feature.";
+    public static final String MESSAGE_REQUIRE_SIGN_UP = "Please sign up to use Club Connect.";
+    public static final String MESSAGE_REQUIRE_EXCO_LOG_IN = "You need to be an Exco member to use this feature.";
+    public static final String MESSAGE_REQUIRE_LOG_OUT = "Please logout before logging in to another account.";
 }
diff --git a/src/main/java/seedu/club/logic/commands/SignUpCommand.java b/src/main/java/seedu/club/logic/commands/SignUpCommand.java
@@ -26,7 +26,7 @@ public class SignUpCommand extends Command {
             Arrays.asList(COMMAND_WORD, "register", "enroll")
     );
 
-    public static final String COMMAND_FORMAT = COMMAND_WORD + " n/ p/ e/ m/ [pic/ ] ";
+    public static final String COMMAND_FORMAT = COMMAND_WORD + " n/ p/ e/ m/ [t/]";
 
     public static final String MESSAGE_SUCCESS = "Sign up successful! Please log in with your matriculation number"
             + " and password to start using Club Connect.";

diff --git a/src/main/java/seedu/club/model/ClubBook.java b/src/main/java/seedu/club/model/ClubBook.java
@@ -439,7 +439,7 @@ private void deleteTagFromMember(Tag tag, Member member) throws MemberNotFoundEx
         }
 
         Member newMember = new Member(member.getName(), member.getPhone(), member.getEmail(), member.getMatricNumber(),
-                member.getGroup(), memberTags);
+                member.getGroup(), memberTags, member.getCredentials(), member.getProfilePhoto());
         try {
             updateMember(member, newMember);
         } catch (DuplicateMatricNumberException dme) {

diff --git a/src/main/java/seedu/club/model/poll/Question.java b/src/main/java/seedu/club/model/poll/Question.java
@@ -8,9 +8,8 @@
  */
 public class Question {
 
-    public static final String MESSAGE_QUESTION_CONSTRAINTS = "Questions may not be empty";
+    public static final String MESSAGE_QUESTION_CONSTRAINTS = "You need a question for the poll.";
     public static final String QUESTION_VALIDATION_REGEX = ".*\\S.*";
-    public static final String PREFIX_QUESTION = "Qn: ";
 
     private String value;
 
@@ -42,6 +41,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return PREFIX_QUESTION + value;
+        return value;
     }
 }
diff --git a/src/main/java/seedu/club/ui/AnswerCard.java b/src/main/java/seedu/club/ui/AnswerCard.java
@@ -12,7 +12,7 @@
 public class AnswerCard extends UiPart<Region> {
 
     private static final String FXML = "AnswerListCard.fxml";
-    private static final String DESCRIPTION_VOTE_COUNT = "Vote Count: ";
+    private static final String DESCRIPTION_VOTE_COUNT = "Votes: ";
     private static final String PERCENTAGE_SYMBOL = "%";
     private final int totalVoteCount;
 

diff --git a/src/main/java/seedu/club/ui/MemberCard.java b/src/main/java/seedu/club/ui/MemberCard.java
@@ -21,8 +21,8 @@ public class MemberCard extends UiPart<Region> {
     private static final String[] TAG_COLORS = {"red", "yellow", "grey", "brown", "pink", "white",
         "orange", "blue", "violet"};
     //@@author amrut-prabhu
-    private static final Integer PHOTO_WIDTH = 90;
-    private static final Integer PHOTO_HEIGHT = 120;
+    private static final Integer PHOTO_WIDTH = 100;
+    private static final Integer PHOTO_HEIGHT = 130;
     private static final String DEFAULT_PHOTO_PATH = "/images/defaultProfilePhoto.png";
     private static final String EMPTY_STRING = "";
 

diff --git 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/java/seedu/club/ui/PollCard.java b/src/main/java/seedu/club/ui/PollCard.java
@@ -13,7 +13,7 @@
 public class PollCard extends UiPart<Region> {
 
     private static final String FXML = "PollListCard.fxml";
-    private static final String DESCRIPTION_TOTAL_VOTE_COUNT = "Total Vote Count: ";
+    private static final String DESCRIPTION_TOTAL_VOTE_COUNT = "Total Votes: ";
 
     public final Poll poll;
 

diff --git a/src/main/java/seedu/club/ui/StatusBarFooter.java b/src/main/java/seedu/club/ui/StatusBarFooter.java
@@ -1,5 +1,7 @@
 package seedu.club.ui;
 
+import java.io.File;
+import java.io.IOException;
 import java.time.Clock;
 import java.util.Date;
 import java.util.logging.Logger;
@@ -19,8 +21,9 @@
  */
 public class StatusBarFooter extends UiPart<Region> {
 
-    public static final String SYNC_STATUS_INITIAL = "Not updated yet in this session";
-    public static final String SYNC_STATUS_UPDATED = "Last Updated: %s";
+    public static final String SYNC_STATUS_INITIAL = "Not updated Club Connect yet in this session";
+    public static final String SYNC_STATUS_UPDATED = "Last Updated Club Connect at: %s";
+    public static final String SAVE_LOCATION = "Data saved in %s";
 
     /**
      * Used to generate time stamps.
@@ -64,7 +67,13 @@ public static Clock getClock() {
     }
 
     private void setSaveLocation(String location) {
-        Platform.runLater(() -> this.saveLocationStatus.setText(location));
+        try {
+            String saveFileLocation = new File(location).getCanonicalPath();
+            Platform.runLater(() -> this.saveLocationStatus.setText(String.format(SAVE_LOCATION, saveFileLocation)));
+        } catch (IOException ioe) {
+            String saveFileLocation = new File(location).getAbsolutePath();
+            Platform.runLater(() -> this.saveLocationStatus.setText(String.format(SAVE_LOCATION, saveFileLocation)));
+        }
     }
 
     private void setSyncStatus(String status) {

diff --git a/src/main/resources/view/AnswerListCard.fxml b/src/main/resources/view/AnswerListCard.fxml
@@ -20,19 +20,19 @@
         </columnConstraints>
         <VBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" minHeight="33.0" prefHeight="106.0" prefWidth="213.0" GridPane.columnIndex="0">
             <padding>
-                <Insets bottom="5" left="15" right="5" top="5" />
+                <Insets bottom="5" left="15" right="5" top="2" />
             </padding>
             <HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" prefHeight="65.0" prefWidth="135.0" spacing="5" VBox.vgrow="ALWAYS">
                 <Label fx:id="choice" maxHeight="1.7976931348623157E308" styleClass="cell_big_label" wrapText="true">
                     <minWidth>
                         <Region fx:constant="USE_PREF_SIZE" />
                     </minWidth>
                 </Label>
-                <Label fx:id="answerValue" maxHeight="1.7976931348623157E308" wrapText="true" />
+                <Label fx:id="answerValue" styleClass="cell_big_label" maxHeight="1.7976931348623157E308" wrapText="true" />
             </HBox>
          <VBox maxHeight="1.7976931348623157E308">
             <children>
-                    <Label fx:id="voteCount" maxHeight="1.7976931348623157E308" styleClass="cell_big_label">
+                    <Label fx:id="voteCount" maxHeight="1.7976931348623157E308" styleClass="cell_small_label">
                         <minWidth>
                             <Region fx:constant="USE_PREF_SIZE" />
                         </minWidth>
@@ -43,7 +43,7 @@
                         <HBox.margin>
                            <Insets />
                         </HBox.margin></ProgressBar>
-                     <Label fx:id="votePercentage" alignment="TOP_LEFT" styleClass="cell_big_label">
+                     <Label fx:id="votePercentage" alignment="TOP_LEFT" styleClass="cell_small_label">
                         <minWidth>
                            <Region fx:constant="USE_PREF_SIZE" />
                         </minWidth>