diff --git a/android/assets/themes/bandw.theme b/android/assets/themes/bandw.theme index fa1c91b..87d7119 100644 --- a/android/assets/themes/bandw.theme +++ b/android/assets/themes/bandw.theme @@ -3,12 +3,12 @@ "price": 20, "colors": { "background": "0a0a0aff", - "foreground": "f0f0f0ff", + "foreground": "202020ff", "buttons": [ - "4d4d4dff", - "4d4d4dff", - "4d4d4dff", - "4d4d4dff" + "f0f0f0ff", + "f0f0f0ff", + "f0f0f0ff", + "f0f0f0ff" ], "empty_cell": "000000ff", "cells": [ @@ -19,8 +19,8 @@ "current_score": "b3b3b3ff", "high_score": "f9f9f9ff", "bonus": "f9f9f9ff", - "band": "4d4d4dff", - "text": "f0f0f0ff" + "band": "f0f0f0ff", + "text": "0a0a0aff" }, "cell_texture": "basic.png" } diff --git a/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java b/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java index 611e3c8..57ac430 100644 --- a/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java +++ b/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java @@ -1,5 +1,6 @@ package io.github.lonamiwebs.klooni.actors; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; @@ -42,8 +43,9 @@ public class ThemeCard extends Actor { priceLabel = new Label("", labelStyle); nameLabel = new Label(theme.getDisplay(), labelStyle); - priceLabel.setColor(theme.textColor); - nameLabel.setColor(theme.textColor); + Color labelColor = Theme.shouldUseWhite(theme.background) ? Color.WHITE : Color.BLACK; + priceLabel.setColor(labelColor); + nameLabel.setColor(labelColor); priceBounds = new Rectangle(); nameBounds = new Rectangle(); diff --git a/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java b/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java index b21f85c..6b37de1 100644 --- a/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java +++ b/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.files.FileHandle; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Interpolation; @@ -183,7 +184,9 @@ class PauseMenuStage extends Stage { // This is the only place where ShapeRenderer is OK because the batch hasn't started Gdx.gl.glEnable(GL20.GL_BLEND); shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); - shapeRenderer.setColor(1f, 1f, 1f, 0.3f); + Color color = new Color(Klooni.theme.bandColor); + color.a = 0.1f; + shapeRenderer.setColor(color); shapeRenderer.rect(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); shapeRenderer.end(); }