From 0fbea2ca0f8595cc6854e9220211d986457c5423 Mon Sep 17 00:00:00 2001 From: Janet-Doe Date: Thu, 10 Apr 2025 11:54:06 +0200 Subject: [PATCH] update colors for console version --- .../java/chess/view/consolerender/Colors.java | 36 +++++++++++++++++++ .../chess/view/consolerender/Console.java | 18 +++------- .../view/consolerender/ConsolePieceName.java | 14 ++------ 3 files changed, 42 insertions(+), 26 deletions(-) create mode 100644 app/src/main/java/chess/view/consolerender/Colors.java diff --git a/app/src/main/java/chess/view/consolerender/Colors.java b/app/src/main/java/chess/view/consolerender/Colors.java new file mode 100644 index 0000000..a2e69c0 --- /dev/null +++ b/app/src/main/java/chess/view/consolerender/Colors.java @@ -0,0 +1,36 @@ +package chess.view.consolerender; + +public class Colors { + // Reset + public static final String RESET = "\u001B[0m"; // Text Reset + + // Regular Colors + public static final String BLACK = "\u001B[30m"; + public static final String RED = "\u001B[31m"; + public static final String GREEN = "\u001B[32m"; + public static final String YELLOW = "\u001B[33m"; + public static final String BLUE = "\u001B[34m"; + public static final String PURPLE = "\u001B[35m"; + public static final String CYAN = "\u001B[36m"; + public static final String WHITE = "\u001B[37m"; + + // Background + public static final String BLACK_BACKGROUND = "\033[40m"; // BLACK + public static final String RED_BACKGROUND = "\033[41m"; // RED + public static final String GREEN_BACKGROUND = "\033[42m"; // GREEN + public static final String YELLOW_BACKGROUND = "\033[43m"; // YELLOW + public static final String BLUE_BACKGROUND = "\033[44m"; // BLUE + public static final String PURPLE_BACKGROUND = "\033[45m"; // PURPLE + public static final String CYAN_BACKGROUND = "\033[46m"; // CYAN + public static final String WHITE_BACKGROUND = "\033[47m"; // WHITE + + // High Intensity backgrounds + public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK + public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED + public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN + public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW + public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE + public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE + public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN + public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE +} \ No newline at end of file diff --git a/app/src/main/java/chess/view/consolerender/Console.java b/app/src/main/java/chess/view/consolerender/Console.java index 3170627..d558526 100644 --- a/app/src/main/java/chess/view/consolerender/Console.java +++ b/app/src/main/java/chess/view/consolerender/Console.java @@ -13,16 +13,6 @@ public class Console implements OutputSystem { private final Scanner scanner = new Scanner(System.in); private final CommandExecutor commandExecutor; private final ConsolePieceName consolePieceName = new ConsolePieceName(); - public static final String ANSI_BLACK_BACKGROUND = "\u001B[40m"; - public static final String ANSI_RED_BACKGROUND = "\u001B[41m"; - public static final String ANSI_GREEN_BACKGROUND = "\u001B[42m"; - public static final String ANSI_YELLOW_BACKGROUND = "\u001B[43m"; - public static final String ANSI_BLUE_BACKGROUND = "\u001B[44m"; - public static final String ANSI_PURPLE_BACKGROUND = "\u001B[45m"; - public static final String ANSI_CYAN_BACKGROUND = "\u001B[46m"; - public static final String ANSI_WHITE_BACKGROUND = "\u001B[47m"; - public static final String ANSI_RESET = "\u001B[0m"; - public Console(CommandExecutor commandExecutor) { this.commandExecutor = commandExecutor; @@ -98,16 +88,16 @@ public class Console implements OutputSystem { for (int j = 0; j < Coordinate.VALUE_MAX; j++) { Piece p = pieceAt(j, i); if ((i+j)%2==0) { - string.append(ANSI_WHITE_BACKGROUND); + string.append(Colors.WHITE_BACKGROUND_BRIGHT); } else { - string.append(ANSI_BLACK_BACKGROUND); + string.append(Colors.BLACK_BACKGROUND_BRIGHT); } if (p == null) { - string.append(" " + ANSI_RESET); + string.append(" " + Colors.RESET); } else { - string.append(" " + consolePieceName.getString(p) + " " + ANSI_RESET ); + string.append(" " + consolePieceName.getString(p) + " " + Colors.RESET); } } string.append("\n"); diff --git a/app/src/main/java/chess/view/consolerender/ConsolePieceName.java b/app/src/main/java/chess/view/consolerender/ConsolePieceName.java index 71d8354..224a01c 100644 --- a/app/src/main/java/chess/view/consolerender/ConsolePieceName.java +++ b/app/src/main/java/chess/view/consolerender/ConsolePieceName.java @@ -6,23 +6,13 @@ import chess.model.PieceVisitor; import chess.model.pieces.*; public class ConsolePieceName implements PieceVisitor { - public static final String ANSI_RESET = "\u001B[0m"; - public static final String ANSI_BLACK = "\u001B[30m"; - public static final String ANSI_RED = "\u001B[31m"; - public static final String ANSI_GREEN = "\u001B[32m"; - public static final String ANSI_YELLOW = "\u001B[33m"; - public static final String ANSI_BLUE = "\u001B[34m"; - public static final String ANSI_PURPLE = "\u001B[35m"; - public static final String ANSI_CYAN = "\u001B[36m"; - public static final String ANSI_WHITE = "\u001B[37m"; - public String getString(Piece piece){ if (piece.getColor()== Color.Black){ - return ANSI_BLACK + visit(piece); + return Colors.BLACK + visit(piece); } else { - return ANSI_WHITE + visit(piece); + return Colors.WHITE + visit(piece); } }