Skip to content

Commit

Permalink
add dark mode
Browse files Browse the repository at this point in the history 
- based on FlatLaf Dark and Darcula themes
- not triggered automatically
- instead the user has to manually edit appstart.properties file and activate
   either swing.defaultlaf=com.formdev.flatlaf.FlatDarkLaf
   or     swing.defaultlaf=com.formdev.flatlaf.FlatDarculaLaf
  • Loading branch information
@smack42
smack42 committed Aug 21, 2022
1 parent 6b8d1b2 commit 4b2ea9d
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 33 deletions.
33 changes: 20 additions & 13 deletions lib/appstart.properties
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,46 @@
# AppStart options
### AppStart options

# specify JVM options here. Default: none
### specify JVM options here. Default: none
app.vm.options = -Xmx800M

# specify a dir where dependent jar files are found. Default: lib
### specify a dir where dependent jar files are found. Default: lib
#app.libs.dir = lib

# specify additional class path resources. Default: none
### specify additional class path resources. Default: none
#app.class.path =

# specify the main class of the application to run. Required
### specify the main class of the application to run. Required
app.main.class = driftingdroids.ui.Starter

# true if you want to follow the output of the child process. Default: false
### true if you want to follow the output of the child process. Default: false
#app.follow = true



# specify here your additional system properties. They will be added
# to the command line as -Dproperty=value
### specify here your additional system properties. They will be added
### to the command line as -Dproperty=value


#user.language=en
#user.language=de
#user.language=ru
#user.language=eo
#user.language=fr

#swing.defaultlaf=com.formdev.flatlaf.FlatLightLaf
swing.defaultlaf=com.formdev.flatlaf.FlatIntelliJLaf

### "light" Look & Feel
swing.defaultlaf=com.formdev.flatlaf.FlatLightLaf
#swing.defaultlaf=com.formdev.flatlaf.FlatIntelliJLaf

### "dark" Look & Feel
#swing.defaultlaf=com.formdev.flatlaf.FlatDarkLaf
#swing.defaultlaf=com.formdev.flatlaf.FlatDarculaLaf

### "good old" Look & Feel
#swing.defaultlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel


# remove the "#" in front of "UseSlowSearchMoreSolutions"
# in order to use a slower, more extensive search that can find a larger
# number of distinct, equally good solutions for some game problems.
### remove the "#" in front of "UseSlowSearchMoreSolutions"
### in order to use a slower, more extensive search that can find a larger
### number of distinct, equally good solutions for some game problems.
#UseSlowSearchMoreSolutions
50 changes: 30 additions & 20 deletions src/driftingdroids/ui/SwingGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,13 @@

public class SwingGUI implements ActionListener {
private static final Color COL_BACKGROUND = new Color(190, 190, 190);
private static final Color COL_BACKGROUND_DARK = new Color(0x3C, 0x3F, 0x41);
private static final Color COL_CELL1 = new Color(210, 210, 210);
private static final Color COL_CELL1_DARK = COL_BACKGROUND_DARK.darker();
private static final Color COL_CELL2 = new Color(245, 245, 245);
private static final Color COL_CELL2_DARK = COL_CELL1_DARK.darker();
private static final Color COL_WALL = new Color(85, 85, 85);
private static final Color COL_WALL_DARK = new Color(0xBB, 0xBB, 0xBB);
private static final Color[] COL_ROBOT = {
new Color(245, 99, 99), //Color.RED,
new Color(99, 245, 99), //Color.GREEN,
Expand Down Expand Up @@ -142,6 +146,7 @@ public class SwingGUI implements ActionListener {
private int placeRobot = -1; //default: false
private boolean selectGoal = false;
private boolean doRefreshJlistQuadrants = true;
private boolean isDarkMode = false;

private final JFrame frame = new JFrame();
private final JPopupMenu popupMenu = new JPopupMenu();
Expand Down Expand Up @@ -258,7 +263,7 @@ private void appendSolutionText(final String str, final Color bgCol) {

private void appendSolutionTextCurrentGoal() {
final Board.Goal goal = this.board.getGoal();
final Icon goalIcon = new GoalIcon(goal, this.jcheckOptShowColorNames.isSelected());
final Icon goalIcon = new GoalIcon(goal, this.jcheckOptShowColorNames.isSelected(), isDarkMode);
final String goalStr = " " + L10N.getString("txt.Goal.text")
+ " - " + Board.getColorLongL10N(goal.robotNumber)
+ " - " + Board.getGoalShapeL10N(goal.shape) + "\n\n";
Expand Down Expand Up @@ -441,6 +446,9 @@ private void createAndShowGUI(String windowTitle) {
this.frame.setTitle(windowTitle);
this.frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

String lafName = UIManager.getLookAndFeel().getName();
this.isDarkMode = lafName.contains("FlatLaf") && (lafName.contains("Dark") || lafName.contains("Darcula"));

final JPanel preparePanel = new JPanel(); //-----------------------------------------------
final DesignGridLayout prepareLayout = new DesignGridLayout(preparePanel);

Expand Down Expand Up @@ -1247,15 +1255,15 @@ protected void paintComponent(Graphics graphics) {
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);

// fill background (walls and center)
g2d.setColor(COL_BACKGROUND);
g2d.setColor(isDarkMode ? COL_BACKGROUND_DARK : COL_BACKGROUND);
g2d.fillRect(0, 0, width, height);

// fill center
g2d.setPaint(new GradientPaint(0, height-1, COL_CELL1, width-1, 0, COL_CELL2));
g2d.setPaint(new GradientPaint(0, height-1, isDarkMode ? COL_CELL1_DARK : COL_CELL1, width-1, 0, isDarkMode ? COL_CELL2_DARK : COL_CELL2));
g2d.fillRect(vWallWidth, hWallWidth, width - vWallWidth * 2, height - hWallWidth * 2);

// fill the 4 walls
g2d.setColor(COL_WALL);
g2d.setColor(isDarkMode ? COL_WALL_DARK : COL_WALL);
if (true == board.isWall(this.boardPosition, Board.NORTH)) {
g2d.fillRect(0, 0, width, hWallWidth);
}
Expand Down Expand Up @@ -1301,7 +1309,7 @@ protected void paintComponent(Graphics graphics) {
final Icon goalIcon = new GoalIcon(
width - 2 * vWallWidth,
height - 2 * hWallWidth,
goal, jcheckOptShowColorNames.isSelected());
goal, jcheckOptShowColorNames.isSelected(), isDarkMode);
goalIcon.paintIcon(this, g2d, vWallWidth, hWallWidth);
this.setToolTipText(L10N.getString("txt.Goal.text") + " - " + Board.getColorLongL10N(goal.robotNumber) + " - " + Board.getGoalShapeL10N(goal.shape));
}
Expand Down Expand Up @@ -1342,7 +1350,7 @@ protected void paintComponent(Graphics graphics) {
final Icon robotIcon = new RobotIcon(
width - 2 * vWallWidth,
height - 2 * hWallWidth,
i, jcheckOptShowColorNames.isSelected());
i, jcheckOptShowColorNames.isSelected(), isDarkMode);
robotIcon.paintIcon(this, g2d, vWallWidth, hWallWidth);
this.setToolTipText(L10N.getString("txt.Robot.text") + " - " + Board.getColorLongL10N(i));
break;
Expand Down Expand Up @@ -1454,7 +1462,7 @@ private void maybeShowPopup(MouseEvent e) {
L10N.getString("txt.Place.text") + " "
+ L10N.getString("txt.Robot.text") + " - "
+ Board.getColorLongL10N(i),
new RobotIcon(robot, jcheckOptShowColorNames.isSelected())) {
new RobotIcon(robot, jcheckOptShowColorNames.isSelected(), isDarkMode)) {
private static final long serialVersionUID = 5584260141986571387L;
@Override
public void actionPerformed(ActionEvent e) {
Expand All @@ -1472,7 +1480,7 @@ public void actionPerformed(ActionEvent e) {
+ Board.getColorLongL10N(goal.robotNumber)
+ " - "
+ Board.getGoalShapeL10N(goal.shape),
new GoalIcon(goal, jcheckOptShowColorNames.isSelected())) {
new GoalIcon(goal, jcheckOptShowColorNames.isSelected(), isDarkMode)) {
private static final long serialVersionUID = 2813443733253766305L;
@Override
public void actionPerformed(ActionEvent e) {
Expand Down Expand Up @@ -1506,17 +1514,18 @@ private void doSelectGoal() {
public static class GoalIcon implements Icon {
private final int width, height;
private final Board.Goal goal;
private final boolean drawColorNames;
private final boolean drawColorNames, isDarkMode;

public GoalIcon(final Board.Goal goal, final boolean drawColorNames) {
this(SwingGUI.ICON_SIZE, SwingGUI.ICON_SIZE, goal, drawColorNames);
public GoalIcon(final Board.Goal goal, final boolean drawColorNames, final boolean isDarkMode) {
this(SwingGUI.ICON_SIZE, SwingGUI.ICON_SIZE, goal, drawColorNames, isDarkMode);
}

public GoalIcon(final int width, final int height, final Board.Goal goal, final boolean drawColorNames) {
public GoalIcon(final int width, final int height, final Board.Goal goal, final boolean drawColorNames, final boolean isDarkMode) {
this.width = width;
this.height = height;
this.goal = goal;
this.drawColorNames = drawColorNames;
this.isDarkMode = isDarkMode;
}

@Override
Expand Down Expand Up @@ -1572,7 +1581,7 @@ public void paintIcon(final Component c, final Graphics g, final int x, final in
g2d.fill(area);
if (this.drawColorNames) {
final String goalColorShort = Board.getColorShortL10N(goal.robotNumber);
g2d.setColor(Color.BLACK);
g2d.setColor(isDarkMode ? Color.WHITE : Color.BLACK);
g2d.drawChars(goalColorShort.toCharArray(), 0, 1, width / 2 - 3, height / 2 + 3);
}
g2d.dispose();
Expand All @@ -1590,25 +1599,26 @@ public int getIconHeight() {

public static class RobotIcon implements Icon {
private final int width, height, robot;
private final boolean drawColorNames;
private final boolean drawColorNames, isDarkMode;

public RobotIcon(final int robot, final boolean drawColorNames) {
this(SwingGUI.ICON_SIZE, SwingGUI.ICON_SIZE, robot, drawColorNames);
public RobotIcon(final int robot, final boolean drawColorNames, final boolean isDarkMode) {
this(SwingGUI.ICON_SIZE, SwingGUI.ICON_SIZE, robot, drawColorNames, isDarkMode);
}

public RobotIcon(final int width, final int height, final int robot, final boolean drawColorNames) {
public RobotIcon(final int width, final int height, final int robot, final boolean drawColorNames, final boolean isDarkMode) {
this.width = width;
this.height = height;
this.robot = robot;
this.drawColorNames = drawColorNames;
this.isDarkMode = isDarkMode;
}

@Override
public void paintIcon(Component c, Graphics g, int x, int y) {
final Graphics2D g2d = (Graphics2D) g.create();
g2d.translate(x, y);
final Paint fillPaint = new GradientPaint(0, 0, COL_ROBOT[this.robot], 0, height-1, Color.DARK_GRAY);
final Color outlineColor = Color.BLACK;
final Color outlineColor = isDarkMode ? Color.LIGHT_GRAY : Color.BLACK;
Polygon shapeFoot = new Polygon();
shapeFoot.addPoint(this.width / 2 - 1, this.height * 3 / 4 - 1);
shapeFoot.addPoint(0, this.height - 1);
Expand Down Expand Up @@ -1648,7 +1658,7 @@ public QuadrantGoalsToolTip(final JComponent c, final int staticQuadrantNumber)
iconPanel.setLayout(new BoxLayout(iconPanel, BoxLayout.X_AXIS));
final List<Board.Goal> goals = Board.getStaticQuadrantGoals(staticQuadrantNumber);
for(Board.Goal goal : goals) {
final Icon icon = new GoalIcon(goal, SwingGUI.this.jcheckOptShowColorNames.isSelected());
final Icon icon = new GoalIcon(goal, SwingGUI.this.jcheckOptShowColorNames.isSelected(), isDarkMode);
iconPanel.add(new JLabel(icon));
}
this.setLayout(new BorderLayout());
Expand Down Expand Up @@ -1679,7 +1689,7 @@ public GoalToolTip(final JComponent c, final int robotNumber, final int shape) {

final JPanel iconPanel = new JPanel(null);
iconPanel.setLayout(new BoxLayout(iconPanel, BoxLayout.X_AXIS));
final Icon icon = new GoalIcon(board.new Goal(0, 0, robotNumber, shape), SwingGUI.this.jcheckOptShowColorNames.isSelected());
final Icon icon = new GoalIcon(board.new Goal(0, 0, robotNumber, shape), SwingGUI.this.jcheckOptShowColorNames.isSelected(), isDarkMode);
iconPanel.add(new JLabel(icon));
this.setLayout(new BorderLayout());
this.add(iconPanel);
Expand Down

0 comments on commit 4b2ea9d

Please sign in to comment.