From 077f1919a40c6ebbcbc435ea1a3ef595865b52e4 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 5 Feb 2017 17:12:29 +0100 Subject: [PATCH] Theme pause band --- android/assets/themes/dark.theme | 3 ++- android/assets/themes/default.theme | 3 ++- .../src/io/github/lonamiwebs/klooni/Theme.java | 6 ++++++ .../github/lonamiwebs/klooni/actors/Band.java | 5 ++--- .../klooni/screens/PauseMenuStage.java | 3 +-- original-resources/generate_theme.py | 3 ++- original-resources/theme.svg | 18 +++++++++++++++--- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/android/assets/themes/dark.theme b/android/assets/themes/dark.theme index acd0076..d93e47f 100644 --- a/android/assets/themes/dark.theme +++ b/android/assets/themes/dark.theme @@ -16,7 +16,8 @@ "d9294dff", "ac342bff" ], "current_score": "c83737ff", - "high_score": "d400aaff" + "high_score": "d400aaff", + "band": "2b5ccfff" }, "cell_texture": "basic.png" } diff --git a/android/assets/themes/default.theme b/android/assets/themes/default.theme index 5d3155d..968c314 100644 --- a/android/assets/themes/default.theme +++ b/android/assets/themes/default.theme @@ -16,7 +16,8 @@ "57cb84ff", "5abee2ff" ], "current_score": "ffcc00ff", - "high_score": "65d681ff" + "high_score": "65d681ff", + "band": "87ceebff" }, "cell_texture": "basic.png" } diff --git a/core/src/io/github/lonamiwebs/klooni/Theme.java b/core/src/io/github/lonamiwebs/klooni/Theme.java index df1d2f4..d35e1ad 100644 --- a/core/src/io/github/lonamiwebs/klooni/Theme.java +++ b/core/src/io/github/lonamiwebs/klooni/Theme.java @@ -26,6 +26,7 @@ public class Theme { public Color currentScore; public Color highScore; + private Color bandColor; private Color[] cells; private Color[] buttons; @@ -107,6 +108,7 @@ public class Theme { currentScore = new Color((int)Long.parseLong(colors.getString("current_score"), 16)); highScore = new Color((int)Long.parseLong(colors.getString("high_score"), 16)); + bandColor = new Color((int)Long.parseLong(colors.getString("band"), 16)); emptyCell = new Color((int)Long.parseLong(colors.getString("empty_cell"), 16)); @@ -147,6 +149,10 @@ public class Theme { return cells[colorIndex]; } + public Color getBandColor() { + return bandColor; + } + public void glClearBackground() { Gdx.gl.glClearColor(background.r, background.g, background.b, background.a); } diff --git a/core/src/io/github/lonamiwebs/klooni/actors/Band.java b/core/src/io/github/lonamiwebs/klooni/actors/Band.java index 5e6ebbc..140426c 100644 --- a/core/src/io/github/lonamiwebs/klooni/actors/Band.java +++ b/core/src/io/github/lonamiwebs/klooni/actors/Band.java @@ -1,6 +1,5 @@ package io.github.lonamiwebs.klooni.actors; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Batch; @@ -32,12 +31,12 @@ public class Band extends Actor { //region Constructor - public Band(final Klooni game, final GameLayout layout, final BaseScorer scorer, final Color bandColor) { + public Band(final Klooni game, final GameLayout layout, final BaseScorer scorer) { this.scorer = scorer; // A 1x1 pixel map will be enough since the band texture will then be expanded Pixmap pixmap = new Pixmap(1, 1, Pixmap.Format.RGBA8888); - pixmap.setColor(bandColor); + pixmap.setColor(Klooni.theme.getBandColor()); pixmap.fill(); bandTexture = new Texture(pixmap); pixmap.dispose(); diff --git a/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java b/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java index a7e7864..754e824 100644 --- a/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java +++ b/core/src/io/github/lonamiwebs/klooni/screens/PauseMenuStage.java @@ -3,7 +3,6 @@ package io.github.lonamiwebs.klooni.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.InputProcessor; -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; @@ -51,7 +50,7 @@ class PauseMenuStage extends Stage { // Current and maximum score band. // Do not add it to the table not to over-complicate things. - band = new Band(game, layout, this.scorer, Color.SKY); + band = new Band(game, layout, this.scorer); addActor(band); // Home screen button diff --git a/original-resources/generate_theme.py b/original-resources/generate_theme.py index 1215a5f..89f67ea 100755 --- a/original-resources/generate_theme.py +++ b/original-resources/generate_theme.py @@ -26,7 +26,8 @@ template = '''{{ "{cell_7}", "{cell_8}" ], "current_score": "{current_score}", - "high_score": "{high_score}" + "high_score": "{high_score}", + "band": "{band}" }}, "cell_texture": "{cell_tex}" }} diff --git a/original-resources/theme.svg b/original-resources/theme.svg index e3ceaca..5c0d6c1 100644 --- a/original-resources/theme.svg +++ b/original-resources/theme.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.49497474" - inkscape:cx="517.48669" - inkscape:cy="678.08613" + inkscape:zoom="0.69999999" + inkscape:cx="335.14124" + inkscape:cy="488.33979" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -268,5 +268,17 @@ id="path4233" inkscape:connector-curvature="0" /> + + +