Merge pull request #42 from IamRENCE/master

Minor app look changes and project tidy up
CS2103-AY1819S1-T13-2 · Oct 18, 2018 · 4acaab9 · 4acaab9
2 parents 91f6801 + 7154a43
commit 4acaab9
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 6 deletions.
diff --git a/copyright.txt b/copyright.txt
@@ -1,7 +1,6 @@
 Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob
 
 Copyright by Susumu Yoshida - http://www.mcdodesign.com/
-- address_book_32.png
 - AddressApp.ico
 
 Copyright by Jan Jan Kovařík - http://glyphicons.com/

diff --git a/docs/images/damithc.jpg b/docs/images/damithc.jpg
diff --git a/docs/images/lejolly.jpg b/docs/images/lejolly.jpg
diff --git a/docs/images/m133225.jpg b/docs/images/m133225.jpg
diff --git a/docs/images/yijinl.jpg b/docs/images/yijinl.jpg
diff --git a/docs/images/yl_coder.jpg b/docs/images/yl_coder.jpg
diff --git a/src/main/java/seedu/address/commons/core/Config.java b/src/main/java/seedu/address/commons/core/Config.java
@@ -13,7 +13,7 @@ public class Config {
     public static final Path DEFAULT_CONFIG_FILE = Paths.get("config.json");
 
     // Config values customizable through config file
-    private String appTitle = "Address App";
+    private String appTitle = "SSENISUB";
     private Level logLevel = Level.INFO;
     private Path userPrefsFilePath = Paths.get("preferences.json");
 

diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/seedu/address/ui/UiManager.java
@@ -30,7 +30,7 @@ public class UiManager extends ComponentManager implements Ui {
     public static final String FILE_OPS_ERROR_DIALOG_CONTENT_MESSAGE = "Could not save data to file";
 
     private static final Logger logger = LogsCenter.getLogger(UiManager.class);
-    private static final String ICON_APPLICATION = "/images/address_book_32.png";
+    private static final String ICON_APPLICATION = "/images/ssenisub.png";
 
     private Logic logic;
     private Config config;

diff --git a/src/main/resources/images/address_book_32.png b/src/main/resources/images/address_book_32.png
diff --git a/src/main/resources/images/ssenisub.png b/src/main/resources/images/ssenisub.png
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -14,7 +14,7 @@
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
          minWidth="450" minHeight="600" onCloseRequest="#handleExit">
   <icons>
-    <Image url="@/images/address_book_32.png" />
+    <Image url="@/images/ssenisub.png" />
   </icons>
   <scene>
     <Scene>

diff --git a/src/test/java/seedu/address/commons/core/ConfigTest.java b/src/test/java/seedu/address/commons/core/ConfigTest.java
@@ -14,7 +14,7 @@ public class ConfigTest {
 
     @Test
     public void toString_defaultObject_stringReturned() {
-        String defaultConfigAsString = "App title : Address App\n"
+        String defaultConfigAsString = "App title : SSENISUB\n"
                 + "Current log level : INFO\n"
                 + "Preference file Location : preferences.json";
 

diff --git a/src/test/java/seedu/address/commons/util/AppUtilTest.java b/src/test/java/seedu/address/commons/util/AppUtilTest.java
@@ -15,7 +15,7 @@ public class AppUtilTest {
 
     @Test
     public void getImage_exitingImage() {
-        assertNotNull(AppUtil.getImage("/images/address_book_32.png"));
+        assertNotNull(AppUtil.getImage("/images/ssenisub.png"));
     }