From 3188374a929a97e1af3ed612674a5761e6bc4ab7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 23 Nov 2017 17:55:15 +0100
Subject: [PATCH] externalized colors
---
bin/de/bricked/main/_de.properties | 8 --------
src/de/bricked/main/_de.properties | 8 --------
src/de/bricked/ui/Controller.java | 11 ++++++-----
src/de/bricked/ui/LevelController.java | 11 ++++++-----
src/de/bricked/ui/LevelPackSelectController.java | 3 ++-
src/de/bricked/ui/LevelSelectController.java | 5 +++--
src/de/bricked/ui/SettingsController.java | 3 ++-
src/de/bricked/ui/cells/LevelCell.java | 9 +++------
src/de/bricked/ui/cells/LevelPackCell.java | 7 ++-----
src/de/bricked/utils/Colors.java | 12 ++++++++++++
10 files changed, 36 insertions(+), 41 deletions(-)
create mode 100644 src/de/bricked/utils/Colors.java
diff --git a/bin/de/bricked/main/_de.properties b/bin/de/bricked/main/_de.properties
index 670750f..f3a534e 100644
--- a/bin/de/bricked/main/_de.properties
+++ b/bin/de/bricked/main/_de.properties
@@ -5,11 +5,3 @@ version.date=23.01.17
author=Max Wittig, Robert Goldmann (Vielen Dank an Tobias)
shortcut.debug.console=F12
-
-color.default=#F4F4F4
-color.background=#333333
-color.background.level=#ADADAD
-color.select.levelpack=#FFDD66
-color.select.level=#77C0EA
-color.button=#333333
-color.button.light=#CCCCCC
\ No newline at end of file
diff --git a/src/de/bricked/main/_de.properties b/src/de/bricked/main/_de.properties
index 670750f..f3a534e 100644
--- a/src/de/bricked/main/_de.properties
+++ b/src/de/bricked/main/_de.properties
@@ -5,11 +5,3 @@ version.date=23.01.17
author=Max Wittig, Robert Goldmann (Vielen Dank an Tobias)
shortcut.debug.console=F12
-
-color.default=#F4F4F4
-color.background=#333333
-color.background.level=#ADADAD
-color.select.levelpack=#FFDD66
-color.select.level=#77C0EA
-color.button=#333333
-color.button.light=#CCCCCC
\ No newline at end of file
diff --git a/src/de/bricked/ui/Controller.java b/src/de/bricked/ui/Controller.java
index fa64c8c..fdca748 100644
--- a/src/de/bricked/ui/Controller.java
+++ b/src/de/bricked/ui/Controller.java
@@ -7,6 +7,7 @@ import java.util.ResourceBundle;
import de.bricked.commandLine.CommandLine;
import de.bricked.commandLine.commands.CommandBundle;
import de.bricked.game.Game;
+import de.bricked.utils.Colors;
import javafx.application.Platform;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -71,11 +72,11 @@ public class Controller implements CommandLineAvailabale
}
});
- mainPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
- buttonLevelSelect.setStyle("-fx-base: " + bundle.getString("color.button"));
- buttonSettings.setStyle("-fx-base: " + bundle.getString("color.button"));
- buttonAchievements.setStyle("-fx-base: " + bundle.getString("color.button"));
- buttonAbout.setStyle("-fx-base: " + bundle.getString("color.button"));
+ mainPane.setStyle("-fx-base: " + Colors.BACKGROUND + ";");
+ buttonLevelSelect.setStyle("-fx-base: " + Colors.BUTTON);
+ buttonSettings.setStyle("-fx-base: " + Colors.BUTTON);
+ buttonAchievements.setStyle("-fx-base: " + Colors.BUTTON);
+ buttonAbout.setStyle("-fx-base: " + Colors.BUTTON);
//TODO re-activate
buttonAchievements.setDisable(true);
diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java
index a33a918..dbe3238 100644
--- a/src/de/bricked/ui/LevelController.java
+++ b/src/de/bricked/ui/LevelController.java
@@ -20,6 +20,7 @@ import de.bricked.game.paddle.PaddleSize;
import de.bricked.game.powerups.PowerUp;
import de.bricked.game.powerups.PowerUpType;
import de.bricked.game.sound.SoundType;
+import de.bricked.utils.Colors;
import de.bricked.utils.CountdownTimer;
import fontAwesome.FontIcon;
import fontAwesome.FontIconType;
@@ -150,9 +151,9 @@ public class LevelController implements CommandLineAvailabale
game.setBoard(new Board(game));
game.setLevelController(this);
- anchorPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
- buttonBack.setStyle("-fx-base: " + bundle.getString("color.button.light"));
- anchorPaneGame.setStyle("-fx-background-color: " + bundle.getString("color.default"));
+ anchorPane.setStyle("-fx-base: " + Colors.BACKGROUND + ";");
+ buttonBack.setStyle("-fx-base: " + Colors.BUTTON_LIGHT);
+ anchorPaneGame.setStyle("-fx-background-color: " + Colors.DEFAULT);
labelMultiplicator.setStyle("-fx-text-fill: #000000;");
anchorPaneGame.setCursor(Cursor.NONE);
@@ -481,7 +482,7 @@ public class LevelController implements CommandLineAvailabale
game.getSoundHandler().play(SoundType.GAME_OVER);
Platform.runLater(() -> {
- AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Game Over", "", "Youe have no lives left", icon, stage, bundle.getString("color.background"), false);
+ AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Game Over", "", "Youe have no lives left", icon, stage, Colors.BACKGROUND, false);
});
}
else
@@ -1077,7 +1078,7 @@ public class LevelController implements CommandLineAvailabale
game.getSoundHandler().play(SoundType.FINISHED_LEVEL);
Platform.runLater(() -> {
- AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Congratulations!", "", "You finished Level \"" + game.getLevel().getName() + "\" with " + game.getTotalPoints() + " Points", icon, stage, bundle.getString("color.background"), false);
+ AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Congratulations!", "", "You finished Level \"" + game.getLevel().getName() + "\" with " + game.getTotalPoints() + " Points", icon, stage, Colors.BACKGROUND, false);
});
}
diff --git a/src/de/bricked/ui/LevelPackSelectController.java b/src/de/bricked/ui/LevelPackSelectController.java
index 24a6d5b..a048a56 100644
--- a/src/de/bricked/ui/LevelPackSelectController.java
+++ b/src/de/bricked/ui/LevelPackSelectController.java
@@ -9,6 +9,7 @@ import de.bricked.game.Game;
import de.bricked.game.levels.LevelPack;
import de.bricked.game.levels.LevelPackHandler;
import de.bricked.ui.cells.LevelPackCell;
+import de.bricked.utils.Colors;
import de.bricked.utils.Downloader;
import javafx.application.Platform;
import javafx.collections.FXCollections;
@@ -119,7 +120,7 @@ public class LevelPackSelectController implements CommandLineAvailabale
}
});
- mainPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
+ mainPane.setStyle("-fx-base: " + Colors.BACKGROUND);
}
public void reload()
diff --git a/src/de/bricked/ui/LevelSelectController.java b/src/de/bricked/ui/LevelSelectController.java
index 75fb3a7..4549cb9 100644
--- a/src/de/bricked/ui/LevelSelectController.java
+++ b/src/de/bricked/ui/LevelSelectController.java
@@ -7,6 +7,7 @@ import java.util.ResourceBundle;
import de.bricked.game.Game;
import de.bricked.game.levels.Level;
import de.bricked.ui.cells.LevelCell;
+import de.bricked.utils.Colors;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.event.EventHandler;
@@ -93,8 +94,8 @@ public class LevelSelectController implements CommandLineAvailabale
}
});
- mainPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
- buttonBack.setStyle("-fx-base: " + bundle.getString("color.button"));
+ mainPane.setStyle("-fx-base: " + Colors.BACKGROUND);
+ buttonBack.setStyle("-fx-base: " + Colors.BUTTON);
}
public void reload()
diff --git a/src/de/bricked/ui/SettingsController.java b/src/de/bricked/ui/SettingsController.java
index 33e6774..8c4092b 100644
--- a/src/de/bricked/ui/SettingsController.java
+++ b/src/de/bricked/ui/SettingsController.java
@@ -9,6 +9,7 @@ import de.bricked.game.Game;
import de.bricked.game.settings.GameSize;
import de.bricked.ui.cells.ComboBoxLanguageCell;
import de.bricked.ui.cells.ComboBoxResolutionCell;
+import de.bricked.utils.Colors;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
@@ -110,7 +111,7 @@ public class SettingsController implements CommandLineAvailabale
initTableViewControls();
- mainPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
+ mainPane.setStyle("-fx-base: " + Colors.BACKGROUND);
}
public void save()
diff --git a/src/de/bricked/ui/cells/LevelCell.java b/src/de/bricked/ui/cells/LevelCell.java
index dcf087d..817a060 100644
--- a/src/de/bricked/ui/cells/LevelCell.java
+++ b/src/de/bricked/ui/cells/LevelCell.java
@@ -1,9 +1,7 @@
package de.bricked.ui.cells;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
import de.bricked.game.levels.Level;
+import de.bricked.utils.Colors;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
@@ -16,7 +14,6 @@ import javafx.scene.layout.Region;
public class LevelCell extends ListCell<Level>
{
- private final ResourceBundle bundle = ResourceBundle.getBundle("de/bricked/main/", Locale.GERMANY);
private double maxWidth;
public LevelCell(double maxWidth)
@@ -29,7 +26,7 @@ public class LevelCell extends ListCell<Level>
{
super.updateItem(item, empty);
- if( ! empty)
+ if(!empty)
{
HBox hbox = new HBox();
@@ -113,7 +110,7 @@ public class LevelCell extends ListCell<Level>
HBox.setMargin(labelAuthor, new Insets(0, 0, 0, 10));
hbox.setAlignment(Pos.CENTER);
- hbox.setStyle("-fx-background-color: " + bundle.getString("color.select.level") + ";");
+ hbox.setStyle("-fx-background-color: " + Colors.SELECT_LEVEL);
hbox.setPadding(new Insets(15));
setGraphic(hbox);
diff --git a/src/de/bricked/ui/cells/LevelPackCell.java b/src/de/bricked/ui/cells/LevelPackCell.java
index d255ccf..07f8c27 100644
--- a/src/de/bricked/ui/cells/LevelPackCell.java
+++ b/src/de/bricked/ui/cells/LevelPackCell.java
@@ -1,9 +1,7 @@
package de.bricked.ui.cells;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
import de.bricked.game.levels.LevelPack;
+import de.bricked.utils.Colors;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
@@ -14,7 +12,6 @@ import javafx.scene.layout.Region;
public class LevelPackCell extends ListCell<LevelPack>
{
- private final ResourceBundle bundle = ResourceBundle.getBundle("de/bricked/main/", Locale.GERMANY);
private double maxWidth;
public LevelPackCell(double maxWidth)
@@ -57,7 +54,7 @@ public class LevelPackCell extends ListCell<LevelPack>
HBox.setMargin(labelAuthor, new Insets(0, 0, 0, 10));
hbox.setAlignment(Pos.CENTER);
- hbox.setStyle("-fx-background-color: " + bundle.getString("color.select.levelpack") + ";");
+ hbox.setStyle("-fx-background-color: " + Colors.SELECT_LEVELPACK);
hbox.setPadding(new Insets(15));
hbox.setMaxWidth(maxWidth);
diff --git a/src/de/bricked/utils/Colors.java b/src/de/bricked/utils/Colors.java
new file mode 100644
index 0000000..f7c0ef5
--- /dev/null
+++ b/src/de/bricked/utils/Colors.java
@@ -0,0 +1,12 @@
+package de.bricked.utils;
+
+public class Colors
+{
+ public static String DEFAULT = "#F4F4F4";
+ public static String BACKGROUND = "#333333";
+ public static String BACKGROUND_LEVEL = "#ADADAD";
+ public static String SELECT_LEVELPACK = "#FFDD66";
+ public static String SELECT_LEVEL = "#77C0EA";
+ public static String BUTTON = "#333333";
+ public static String BUTTON_LIGHT = "#CCCCCC";
+}
\ No newline at end of file
--
GitLab