Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed the font-size [issue 7] #10

Merged
merged 8 commits into from
Dec 3, 2023
Merged

changed the font-size [issue 7] #10

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f2867a
changed the font-size
tmpcgp Apr 11, 2023
dc7a9ab
added the getFontSizeForTileValue method for scaling
tmpcgp Apr 16, 2023
3429b76
changed the default fontsize to 120
tmpcgp Apr 16, 2023
2382e2f
removed comments
tmpcgp Apr 16, 2023
09f9603
made the variables final
tmpcgp Apr 17, 2023
2adef7c
Merge branch 'develop' into develop
Taz03 Dec 3, 2023
2077151
Update Renderer2048.java
Taz03 Dec 3, 2023
28a25d4
Update Renderer2048.java
Taz03 Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/src/main/java/com/togetherjava/tjplays/games/game2048/Renderer2048.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public final class Renderer2048 {

private static final int TILE_SIDE = 200;
private static final int PADDING = 20;
private static final int DEFAULT_FONT_SIZE = 120;
private static final int SCALE = 8;
private static Map<Integer, Color> tileColorMap = new HashMap<>();

private Game2048 game;
Expand Down Expand Up @@ -54,6 +56,10 @@ public void setGame(Game2048 game) {
this.game = game;
}

private static int getFontSizeForTileValue(int tileValue) {
return DEFAULT_FONT_SIZE - String.valueOf(tileValue).length() * SCALE;
}

public byte[] getData() {
Graphics2D graphics = image.createGraphics();

Expand All @@ -74,7 +80,7 @@ public byte[] getData() {
if (tileValue == 0) continue;

graphics.setColor(tileValue < 8 ? new Color(130, 115, 100) : Color.WHITE);
graphics.setFont(new Font("Arial", Font.BOLD, tileValue > 1000 ? 80 : 100));
graphics.setFont(new Font("Arial", Font.BOLD, getFontSizeForTileValue(tileValue)));
FontMetrics tileMetrics = graphics.getFontMetrics();
String tileText = String.valueOf(tileValue);
graphics.drawString(tileText,
Expand All @@ -96,7 +102,7 @@ public byte[] getData() {
};

graphics.setColor(Color.BLACK);
graphics.setFont(new Font("Arial", Font.BOLD, 120));
graphics.setFont(new Font("Arial", Font.BOLD, DEFAULT_FONT_SIZE));
FontMetrics metrics = graphics.getFontMetrics();
graphics.drawString(text,
(image.getWidth() - metrics.stringWidth(text)) / 2,
Expand Down
Loading