From: rnayabed <debayansutradhar3@gmail.com>
Date: Fri, 29 Jan 2021 22:38:57 +0530
Subject: Refactored matrix location, added platform checks while checking whether rows/cols will go out of bounds
---
Refactored matrix location, added platform checks while checking whether rows/cols will go out of bounds
---


--- 'a/src/main/java/com/StreamPi/Server/Window/Settings/About.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Settings/About.java
@@ -73,9 +73,15 @@ public class About extends VBox{
             openWebpage("https://twitter.com/Stream_Pi");
         });
 
+        Hyperlink matrix = new Hyperlink("Matrix");
+        matrix.setOnAction(event -> {
+            openWebpage("https://matrix.to/#/#stream-pi_general:matrix.org");
+        });
+
+
         links.setSpacing(30);
         links.setAlignment(Pos.CENTER);
-        links.getChildren().addAll(github, discord, website, twitter);
+        links.getChildren().addAll(github, matrix, discord, website, twitter);
 
         Hyperlink donateButton = new Hyperlink("DONATE");
         donateButton.setOnAction(event -> {

--- 'a/src/main/java/com/StreamPi/Server/Window/Settings/ClientsSettings.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Settings/ClientsSettings.java
@@ -146,7 +146,7 @@ public class ClientsSettings extends VBo
                                 double startupWidth = Double.parseDouble(clientSettingsVBox.getStartupWindowWidth());
 
 
-                                if((rows*actionsSize) > (startupWidth - 25))
+                                if((rows*actionsSize) > (startupWidth - 25) && clientSettingsVBox.getPlatform()!= com.StreamPi.Util.Platform.Platform.ANDROID)
                                 {
                                     errors2.append("        Rows out of bounds of screen size. \n"+startupWidth);
                                 }
@@ -163,7 +163,7 @@ public class ClientsSettings extends VBo
                                 int actionsSize = Integer.parseInt(clientProfileVBox.getActionSize());
                                 double startupHeight = Double.parseDouble(clientSettingsVBox.getStartupWindowHeight());
 
-                                if((cols*actionsSize) > (startupHeight - 25))
+                                if((cols*actionsSize) > (startupHeight - 25) && clientSettingsVBox.getPlatform()!= com.StreamPi.Util.Platform.Platform.ANDROID)
                                 {
                                     errors2.append("        Cols out of bounds of screen size. \n"+startupHeight);
                                 }
@@ -304,6 +304,12 @@ public class ClientsSettings extends VBo
             return nickNameLabel.getText();
         }
 
+        private com.StreamPi.Util.Platform.Platform platform;
+
+        public com.StreamPi.Util.Platform.Platform getPlatform() {
+            return platform;
+        }
+
         private Label socketConnectionLabel;
 
         private ClientConnection connection;
@@ -323,6 +329,7 @@ public class ClientsSettings extends VBo
         public ClientSettingsVBox(ClientConnection connection)
         {
             this.connection = connection;
+            this.platform = connection.getClient().getPlatform();
 
             clientProfileVBoxes = new ArrayList<>();