client

Clone or download

cleanup, refactored

Modified Files

--- 'a/src/main/java/com/stream_pi/client/info/ClientInfo.java'
+++ b/src/main/java/com/stream_pi/client/info/ClientInfo.java
@@ -114,18 +114,6 @@ public class ClientInfo {
}
- private boolean showFullScreenToggleButton = true;
-
- public boolean isShowFullScreenToggleButton()
- {
- return showFullScreenToggleButton;
- }
-
- public void setShowFullScreenToggleButton(boolean showFullScreenToggleButton)
- {
- this.showFullScreenToggleButton = showFullScreenToggleButton;
- }
-
public boolean isPhone()
{
return getPlatform() == Platform.ANDROID || getPlatform() == Platform.IOS;
--- 'a/src/main/java/com/stream_pi/client/window/settings/GeneralTab.java'
+++ b/src/main/java/com/stream_pi/client/window/settings/GeneralTab.java
@@ -279,11 +279,6 @@ public class GeneralTab extends VBox
Platform platform = ClientInfo.getInstance().getPlatform();
- if(platform == Platform.LINUX)
- {
- fullScreenModeHBox.setVisible(StartupFlags.IS_X_MODE);
- }
-
if(platform == Platform.ANDROID ||
platform == Platform.IOS)
{
@@ -305,13 +300,13 @@ public class GeneralTab extends VBox
vibrateOnActionPressHBox.setVisible(false);
- fullScreenModeHBox.setVisible(ClientInfo.getInstance().isShowFullScreenToggleButton());
+ fullScreenModeHBox.setVisible(StartupFlags.SHOW_FULLSCREEN_TOGGLE_BUTTON);
buttonBar.getChildren().add(exitButton);
}
- screenTimeoutSecondsHBoxInputBox.setVisible(ClientInfo.getInstance().isShowFullScreenToggleButton());
+ screenTimeoutSecondsHBoxInputBox.setVisible(StartupFlags.SCREEN_SAVER_FEATURE);
screenSaverHBox.setVisible(StartupFlags.SCREEN_SAVER_FEATURE);
}