RustyStriker/Klooni1010
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Black et White theme

Browse source
This commit is contained in:
Lonami Exo 2017-05-07 15:57:10 +02:00
parent fbff065a8d
commit d34a566af3
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/assets/themes/bandw.theme
View file

@ -3,12 +3,12 @@
"price": 20, "price": 20,
"colors": { "colors": {
"background": "0a0a0aff", "background": "0a0a0aff",
"foreground": "f0f0f0ff", "foreground": "202020ff",
"buttons": [ "buttons": [
"4d4d4dff", "f0f0f0ff",
"4d4d4dff", "f0f0f0ff",
"4d4d4dff", "f0f0f0ff",
"4d4d4dff" "f0f0f0ff"
], ],
"empty_cell": "000000ff", "empty_cell": "000000ff",
"cells": [ "cells": [
@ -19,8 +19,8 @@
"current_score": "b3b3b3ff", "current_score": "b3b3b3ff",
"high_score": "f9f9f9ff", "high_score": "f9f9f9ff",
"bonus": "f9f9f9ff", "bonus": "f9f9f9ff",
"band": "4d4d4dff", "band": "f0f0f0ff",
"text": "f0f0f0ff" "text": "0a0a0aff"
}, },
"cell_texture": "basic.png" "cell_texture": "basic.png"
} }

6
core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java
View file

@ -1,5 +1,6 @@
package io.github.lonamiwebs.klooni.actors; package io.github.lonamiwebs.klooni.actors;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
@ -42,8 +43,9 @@ public class ThemeCard extends Actor {
priceLabel = new Label("", labelStyle); priceLabel = new Label("", labelStyle);
nameLabel = new Label(theme.getDisplay(), labelStyle); nameLabel = new Label(theme.getDisplay(), labelStyle);
priceLabel.setColor(theme.textColor); Color labelColor = Theme.shouldUseWhite(theme.background) ? Color.WHITE : Color.BLACK;
nameLabel.setColor(theme.textColor); priceLabel.setColor(labelColor);
nameLabel.setColor(labelColor);
priceBounds = new Rectangle(); priceBounds = new Rectangle();
nameBounds = new Rectangle(); nameBounds = new Rectangle();

5
core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java
View file

@ -5,6 +5,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Interpolation; 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 // This is the only place where ShapeRenderer is OK because the batch hasn't started
Gdx.gl.glEnable(GL20.GL_BLEND); Gdx.gl.glEnable(GL20.GL_BLEND);
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); 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.rect(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
shapeRenderer.end(); shapeRenderer.end();
} }