Refactored config, implemented Full MVP to General Settings, refactor…

…ed general settings records

src/main/java/com/stream_pi/server/io/Config.java → src/main/java/com/stream_pi/server/config/Config.java

@@ -20,7 +20,7 @@
 handler for config.xml
  */
 
-package com.stream_pi.server.io;
+package com.stream_pi.server.config;
 
 import java.awt.*;
 import java.io.File;

src/main/java/com/stream_pi/server/config/record/ActionGridSettings.java

@@ -0,0 +1,5 @@
+package com.stream_pi.server.config.record;
+
+public record ActionGridSettings(double actionGridActionSize, boolean actionGridUseSameActionSizeAsProfile, double actionGridActionGap, boolean actionGridUseSameActionGapAsProfile, double actionGridActionDisplayTextFontSize, boolean actionGridUseSameActionDisplayTextFontSizeAsProfile)
+{
+}

src/main/java/com/stream_pi/server/config/record/ConnectionSettings.java

@@ -0,0 +1,4 @@
+package com.stream_pi.server.config.record;
+
+public record ConnectionSettings(String serverName, int port, String IP) {
+}

src/main/java/com/stream_pi/server/config/record/GeneralSettings.java

@@ -0,0 +1,21 @@
+package com.stream_pi.server.config.record;
+
+// TODO: This should be moved to Config and not only just GeneralSettings
+/*public record GeneralSettings(String serverName, int port, double actionGridActionDisplayTextFontSize,
+                              String pluginsPath, String themesPath,
+                              double actionGridActionSize,
+                              boolean actionGridUseSameActionSizeAsProfile, boolean actionGridUseSameActionGapAsProfile,
+                              boolean actionGridUseSameActionDisplayTextFontSizeAsProfile,
+                              double actionGridActionGap,
+                              boolean minimiseToSystemTrayOnClose, boolean showAlertsPopup, boolean startOnBoot,
+                              boolean soundOnActionClickedStatus, String soundOnActionClickedFilePath,
+                              String IP, Locale currentLanguageLocale)
+{
+
+}*/
+
+public record GeneralSettings(ConnectionSettings connection, ActionGridSettings actionGrid, LocationsSettings locations, SoundOnActionClickedSettings soundOnActionClicked, OthersSettings others)
+{
+
+}
+

src/main/java/com/stream_pi/server/config/record/LocationsSettings.java

@@ -0,0 +1,4 @@
+package com.stream_pi.server.config.record;
+
+public record LocationsSettings(String pluginsPath, String themesPath) {
+}

src/main/java/com/stream_pi/server/config/record/OthersSettings.java

@@ -0,0 +1,6 @@
+package com.stream_pi.server.config.record;
+
+import java.util.Locale;
+
+public record OthersSettings(Locale currentLanguageLocale, boolean minimiseToSystemTrayOnClose, boolean startOnBoot, boolean showAlertsPopup) {
+}

src/main/java/com/stream_pi/server/config/record/SoundOnActionClickedSettings.java

@@ -0,0 +1,4 @@
+package com.stream_pi.server.config.record;
+
+public record SoundOnActionClickedSettings(String soundOnActionClickedFilePath, boolean soundOnActionClickedStatus) {
+}

src/main/java/com/stream_pi/server/connection/ClientConnection.java

@@ -22,10 +22,8 @@
 import com.stream_pi.action_api.actionproperty.gaugeproperties.GaugeProperties;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.StringProperty;
-import com.stream_pi.action_api.actionproperty.property.Type;
 import com.stream_pi.action_api.externalplugin.ExternalPlugin;
 import com.stream_pi.action_api.externalplugin.GaugeAction;
-import com.stream_pi.action_api.externalplugin.ToggleAction;
 import com.stream_pi.action_api.externalplugin.inputevent.StreamPiInputEvent;
 import com.stream_pi.action_api.otheractions.CombineAction;
 import com.stream_pi.action_api.otheractions.FolderAction;
@@ -36,9 +34,8 @@
 import com.stream_pi.server.controller.ServerListener;
 import com.stream_pi.server.i18n.I18N;
 import com.stream_pi.server.info.ServerInfo;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.window.ExceptionAndAlertHandler;
-import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;
 import com.stream_pi.util.alert.StreamPiAlert;
 import com.stream_pi.util.alert.StreamPiAlertType;
 import com.stream_pi.util.comms.DisconnectReason;
@@ -49,21 +46,13 @@
 import com.stream_pi.util.platform.Platform;
 import com.stream_pi.util.platform.ReleaseStatus;
 import com.stream_pi.util.version.Version;
-import eu.hansolo.medusa.Gauge;
 import javafx.concurrent.Task;
-import javafx.event.EventType;
 import javafx.geometry.Orientation;
-import javafx.scene.control.Toggle;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.TouchEvent;
 
 import java.io.*;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/main/java/com/stream_pi/server/controller/Controller.java

@@ -30,7 +30,7 @@
 import com.stream_pi.server.i18n.I18N;
 import com.stream_pi.server.info.ServerInfo;
 import com.stream_pi.server.info.StartupFlags;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.window.Base;
 import com.stream_pi.server.window.GlobalExceptionAndAlertHandler;
 import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;

src/main/java/com/stream_pi/server/window/Base.java

@@ -16,8 +16,7 @@
 import com.stream_pi.action_api.ActionAPI;
 import com.stream_pi.server.controller.ServerListener;
 import com.stream_pi.server.i18n.I18N;
-import com.stream_pi.server.info.StartupFlags;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.info.ServerInfo;
 import com.stream_pi.server.Main;
 import com.stream_pi.server.window.dashboard.DashboardBase;
@@ -28,25 +27,19 @@
 import com.stream_pi.theme_api.Themes;
 import com.stream_pi.util.Util;
 import com.stream_pi.util.alert.StreamPiAlert;
-import com.stream_pi.util.alert.StreamPiAlertButton;
-import com.stream_pi.util.alert.StreamPiAlertListener;
-import com.stream_pi.util.alert.StreamPiAlertType;
 import com.stream_pi.util.exception.MinorException;
 import com.stream_pi.util.exception.SevereException;
 import com.stream_pi.util.iohelper.IOHelper;
 import com.stream_pi.util.loggerhelper.StreamPiLogFallbackHandler;
 import com.stream_pi.util.loggerhelper.StreamPiLogFileHandler;
 
-import com.stream_pi.util.platform.Platform;
-import com.stream_pi.util.rootchecker.RootChecker;
 import javafx.application.HostServices;
 import javafx.scene.CacheHint;
 import javafx.scene.image.Image;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.logging.Logger;

src/main/java/com/stream_pi/server/window/GlobalExceptionAndAlertHandler.java

@@ -2,7 +2,7 @@
 
 import com.stream_pi.server.controller.ServerListener;
 import com.stream_pi.server.i18n.I18N;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.util.alert.StreamPiAlert;
 import com.stream_pi.util.alert.StreamPiAlertButton;
 import com.stream_pi.util.alert.StreamPiAlertListener;

src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java

@@ -26,7 +26,7 @@
 import com.stream_pi.server.client.ClientProfile;
 import com.stream_pi.server.connection.ClientConnection;
 import com.stream_pi.server.i18n.I18N;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.window.ExceptionAndAlertHandler;
 import com.stream_pi.server.window.dashboard.actiondetailspane.ActionDetailsPaneListener;
 import com.stream_pi.util.exception.MinorException;

src/main/java/com/stream_pi/server/window/firsttimeuse/FinalConfigPane.java

@@ -17,7 +17,7 @@
 import com.stream_pi.server.controller.ServerListener;
 import com.stream_pi.server.i18n.I18N;
 import com.stream_pi.server.info.ServerInfo;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.window.ExceptionAndAlertHandler;
 import com.stream_pi.server.combobox.IPChooserComboBox;
 import com.stream_pi.util.alert.StreamPiAlert;
@@ -29,7 +29,6 @@
 import com.stream_pi.util.uihelper.HBoxWithSpaceBetween;
 import javafx.application.Platform;
 import javafx.concurrent.Task;
-import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;

src/main/java/com/stream_pi/server/window/firsttimeuse/WelcomePane.java

@@ -18,11 +18,9 @@
 import com.stream_pi.server.combobox.LanguageChooserComboBox;
 import com.stream_pi.server.controller.ServerListener;
 import com.stream_pi.server.i18n.I18N;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.server.window.ExceptionAndAlertHandler;
 import com.stream_pi.util.exception.SevereException;
-import com.stream_pi.util.uihelper.HBoxWithSpaceBetween;
-import javafx.collections.FXCollections;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;

src/main/java/com/stream_pi/server/window/settings/ThemesSettings.java

@@ -16,23 +16,17 @@
 
 import com.stream_pi.server.controller.Controller;
 import com.stream_pi.server.i18n.I18N;
-import com.stream_pi.server.io.Config;
+import com.stream_pi.server.config.Config;
 import com.stream_pi.theme_api.Theme;
 import com.stream_pi.theme_api.Themes;
 import com.stream_pi.util.exception.SevereException;
 import com.stream_pi.util.uihelper.SpaceFiller;
 import javafx.application.HostServices;
 import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.EventHandler;
-import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.ToggleSwitch;
 import org.kordamp.ikonli.javafx.FontIcon;