diff --git a/.classpath b/.classpath
index e32929a..2bf671d 100644
--- a/.classpath
+++ b/.classpath
@@ -5,6 +5,6 @@
-
+
diff --git a/bin/application/Main.class b/bin/application/Main.class
index 9cdfae8..bd0b970 100644
Binary files a/bin/application/Main.class and b/bin/application/Main.class differ
diff --git a/bin/libraries/jfoenix-1.2.0.jar b/bin/libraries/jfoenix-1.2.0.jar
deleted file mode 100644
index 550230d..0000000
Binary files a/bin/libraries/jfoenix-1.2.0.jar and /dev/null differ
diff --git a/bin/libraries/jfoenix-1.3.0.jar b/bin/libraries/jfoenix-1.3.0.jar
new file mode 100644
index 0000000..37e7860
Binary files /dev/null and b/bin/libraries/jfoenix-1.3.0.jar differ
diff --git a/src/application/Main.java b/src/application/Main.java
index 3c75ecc..483b081 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -56,8 +56,6 @@ public class Main extends Application {
private File settingsFile;
private String dirWin = System.getProperty("user.home") + "/Documents/HomeFlix"; //Windows: C:/Users/"User"/Documents/HomeFlix
private String dirLinux = System.getProperty("user.home") + "/HomeFlix"; //Linux: /home/"User"/HomeFlix
- private String fileWin = dirWin + "/config.xml"; //Windows: C:/Users/"User"/Documents/HomeFlix/config.xml
- private String fileLinux = dirLinux + "/config.xml"; //Linux: /home/"User"/HomeFlix/config.xml
@Override
public void start(Stage primaryStage) {
@@ -80,13 +78,18 @@ public class Main extends Application {
mainWindowController.setAutoUpdate(AUTO_UPDATE); //set auto-update
mainWindowController.setMain(this); //call setMain
- //Linux if directory exists -> check config.xml
+ /**Linux else Windows, check if directory & config exist
+ * Windows: config file: C:/Users/"User"/Documents/HomeFlix/config.xml
+ * directory: C:/Users/"User"/Documents/HomeFlix
+ * Linux: config file: /home/"User"/HomeFlix/config.xml
+ * directory: /home/"User"/HomeFlix
+ */
if(System.getProperty("os.name").equals("Linux")) {
directory = new File(dirLinux);
- settingsFile = new File(fileLinux);
+ settingsFile = new File(dirLinux + "/config.xml");
} else {
directory = new File(dirWin);
- settingsFile = new File(fileWin);
+ settingsFile = new File(dirWin + "/config.xml");
}
if(settingsFile.exists() != true){
@@ -103,7 +106,7 @@ public class Main extends Application {
System.exit(0); //finishes itse
}
-
+ //TODO remove when tested under Linux
// if(System.getProperty("os.name").equals("Linux")){
// if(dirLinux.exists() != true){
// dirLinux.mkdir();
diff --git a/src/libraries/jfoenix-1.2.0.jar b/src/libraries/jfoenix-1.2.0.jar
deleted file mode 100644
index 550230d..0000000
Binary files a/src/libraries/jfoenix-1.2.0.jar and /dev/null differ
diff --git a/src/libraries/jfoenix-1.3.0.jar b/src/libraries/jfoenix-1.3.0.jar
new file mode 100644
index 0000000..37e7860
Binary files /dev/null and b/src/libraries/jfoenix-1.3.0.jar differ