From ce26f12d4efab9cc279d78445eaf96478e6e1dc6 Mon Sep 17 00:00:00 2001 From: Oliver Jan Krylow Date: Sun, 9 Apr 2017 21:07:15 +0200 Subject: [PATCH 1/3] Update to gradle 3.3 and light cleanup. --- .../src/io/github/lonamiwebs/klooni/AndroidLauncher.java | 1 - build.gradle | 2 +- core/src/io/github/lonamiwebs/klooni/Klooni.java | 9 ++------- .../io/github/lonamiwebs/klooni/game/PieceHolder.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java b/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java index bd09751..97611d5 100644 --- a/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java +++ b/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java @@ -4,7 +4,6 @@ import android.os.Bundle; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import io.github.lonamiwebs.klooni.Klooni; public class AndroidLauncher extends AndroidApplication { @Override diff --git a/build.gradle b/build.gradle index 0a3ce47..7ce013a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' } } diff --git a/core/src/io/github/lonamiwebs/klooni/Klooni.java b/core/src/io/github/lonamiwebs/klooni/Klooni.java index 33e1f3d..0edac21 100644 --- a/core/src/io/github/lonamiwebs/klooni/Klooni.java +++ b/core/src/io/github/lonamiwebs/klooni/Klooni.java @@ -41,7 +41,7 @@ public class Klooni extends Game { skin.add("button_up", new NinePatch(new Texture( Gdx.files.internal("ui/button_up.png")), 28, 28, 28, 28)); - skin.add("button_down", new NinePatch(new Texture( + skin.add("button_dscalableown", new NinePatch(new Texture( Gdx.files.internal("ui/button_down.png")), 28, 28, 28, 28)); skin.add("play_texture", new Texture(Gdx.files.internal("ui/play.png"))); @@ -82,12 +82,7 @@ public class Klooni extends Game { //endregion //region Screen - - @Override - public void render() { - super.render(); - } - + // TransitionScreen will also dispose by default the previous screen public void transitionTo(Screen screen) { transitionTo(screen, true); diff --git a/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java b/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java index 6b614f3..49d7705 100644 --- a/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java +++ b/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java @@ -223,7 +223,7 @@ public class PieceHolder implements BinSerializable { Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY()); // Y axis is inverted - if (Klooni.onDesktop) { + if (Klooni.onDesktop) { //FIXME(oliver): This is a bad assumption to make. There are desktops with touch input and non-desktops with mouse input. // Center the piece to the mouse mouse.sub(piece.getRectangle().width * 0.5f, piece.getRectangle().height * 0.5f); } else { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d5bc7c..dd70a4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 21 20:46:40 CET 2017 +#Sat Apr 08 12:05:23 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 0c49023bbfab0c0c844f161b845017a81a39fe63 Mon Sep 17 00:00:00 2001 From: Oliver Jan Krylow Date: Mon, 8 May 2017 19:22:23 +0200 Subject: [PATCH 2/3] Added Solarized Light theme. --- android/assets/themes/solarized-dark.theme | 36 +++++++++---------- android/assets/themes/solarized-light.theme | 26 ++++++++++++++ android/assets/themes/theme.list | 2 ++ .../io/github/lonamiwebs/klooni/Theme.java | 5 ++- .../lonamiwebs/klooni/game/BaseScorer.java | 2 +- 5 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 android/assets/themes/solarized-light.theme diff --git a/android/assets/themes/solarized-dark.theme b/android/assets/themes/solarized-dark.theme index 6f27107..7658374 100644 --- a/android/assets/themes/solarized-dark.theme +++ b/android/assets/themes/solarized-dark.theme @@ -1,26 +1,26 @@ { - "name": "Underwater", - "price": 50, + "name": "Solarized Dark", + "price": 0, "colors": { - "background": "0044aaff", - "foreground": "d7f4e3ff", + "background": "002b36ff", + "foreground": "fdf6e3ff", "buttons": [ - "37c871ff", - "2a7fffff", - "00ccffff", - "5f5fd3ff" + "859900ff", + "268bd2ff", + "d33682ff", + "cb4b16ff" ], - "empty_cell": "0066ffff", + "empty_cell": "073642ff", "cells": [ - "37c871ff", "2ad4ffff", "0000d4ff", - "00ffccff", "5599ffff", "87cddeff", "80b3ffff", - "00ff66ff", "00d4aaff" + "657b83ff", "b58900ff", "cb4b16ff", + "dc322fff", "d33682ff", "6c71c4ff", "268bd2ff", + "2aa198ff", "859900ff" ], - "current_score": "aaccffff", - "high_score": "2aff80ff", - "bonus": "aaeeffff", - "band": "3771c8ff", - "text": "002255ff" + "current_score": "586e75ff", + "high_score": "eee8d5ff", + "bonus": "586e75ff", + "band": "2aa198ff", + "text": "fdf6e3ff" }, - "cell_texture": "bubble.png" + "cell_texture": "circle.png" } diff --git a/android/assets/themes/solarized-light.theme b/android/assets/themes/solarized-light.theme new file mode 100644 index 0000000..815b198 --- /dev/null +++ b/android/assets/themes/solarized-light.theme @@ -0,0 +1,26 @@ +{ + "name": "Solarized Light", + "price": 0, + "colors": { + "background": "fdf6e3ff", + "foreground": "002b36ff", + "buttons": [ + "859900ff", + "268bd2ff", + "d33682ff", + "cb4b16ff" + ], + "empty_cell": "eee8d5ff", + "cells": [ + "657b83ff", "b58900ff", "cb4b16ff", + "dc322fff", "d33682ff", "6c71c4ff", "268bd2ff", + "2aa198ff", "859900ff" + ], + "current_score": "586e75ff", + "high_score": "eee8d5ff", + "bonus": "586e75ff", + "band": "b58900ff", + "text": "002b36ff" + }, + "cell_texture": "circle.png" +} diff --git a/android/assets/themes/theme.list b/android/assets/themes/theme.list index 8ffea23..7fbc883 100644 --- a/android/assets/themes/theme.list +++ b/android/assets/themes/theme.list @@ -2,3 +2,5 @@ default dark bandw underwater +solarized-dark +solarized-light diff --git a/core/src/io/github/lonamiwebs/klooni/Theme.java b/core/src/io/github/lonamiwebs/klooni/Theme.java index d366851..f15a83f 100644 --- a/core/src/io/github/lonamiwebs/klooni/Theme.java +++ b/core/src/io/github/lonamiwebs/klooni/Theme.java @@ -25,7 +25,7 @@ public class Theme { public Color background; public Color foreground; - public Color emptyCell; + private Color emptyCell; public Color currentScore; public Color highScore; @@ -34,7 +34,6 @@ public class Theme { public Color textColor; private Color[] cells; - private Color[] buttons; public static Skin skin; @@ -126,7 +125,7 @@ public class Theme { foreground = new Color((int)Long.parseLong(colors.getString("foreground"), 16)); JsonValue buttonColors = colors.get("buttons"); - buttons = new Color[buttonColors.size]; + Color[] buttons = new Color[buttonColors.size]; for (int i = 0; i < buttons.length; ++i) { buttons[i] = new Color((int)Long.parseLong(buttonColors.getString(i), 16)); if (buttonStyles[i] == null) { diff --git a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java index c5017a6..8e5213c 100644 --- a/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java +++ b/core/src/io/github/lonamiwebs/klooni/game/BaseScorer.java @@ -18,7 +18,7 @@ public abstract class BaseScorer implements BinSerializable { //region Members - protected int currentScore; + int currentScore; final Label currentScoreLabel; final Label highScoreLabel; From 239ef365c222fbff782d50474a1b990e52bdaa4b Mon Sep 17 00:00:00 2001 From: Oliver Jan Krylow Date: Mon, 8 May 2017 20:12:18 +0200 Subject: [PATCH 3/3] Added Darcula theme. Adjusted text color on Solarized Light theme. --- android/assets/themes/darcula.theme | 26 +++++++++++++++++++++ android/assets/themes/solarized-light.theme | 6 ++--- android/assets/themes/theme.list | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 android/assets/themes/darcula.theme diff --git a/android/assets/themes/darcula.theme b/android/assets/themes/darcula.theme new file mode 100644 index 0000000..14bc988 --- /dev/null +++ b/android/assets/themes/darcula.theme @@ -0,0 +1,26 @@ +{ + "name": "Darcula", + "price": 0, + "colors": { + "background": "282a36ff", + "foreground": "f8f8f2ff", + "buttons": [ + "8be9fdff", + "ff5555ff", + "ff79c6ff", + "ffb86cf" + ], + "empty_cell": "44475aff", + "cells": [ + "f8f8f2ff", "6272a4ff", "8be9fdff", + "50fa7bff", "ffb86cff", "ff79c6ff", "bd93f9ff", + "ff5555ff", "f1fa8cff" + ], + "current_score": "8be9fdff", + "high_score": "50fa7bff", + "bonus": "bd93f9ff", + "band": "6272a4ff", + "text": "f8f8f2ff" + }, + "cell_texture": "basic.png" +} diff --git a/android/assets/themes/solarized-light.theme b/android/assets/themes/solarized-light.theme index 815b198..ba85582 100644 --- a/android/assets/themes/solarized-light.theme +++ b/android/assets/themes/solarized-light.theme @@ -3,7 +3,7 @@ "price": 0, "colors": { "background": "fdf6e3ff", - "foreground": "002b36ff", + "foreground": "eee8d5ff", "buttons": [ "859900ff", "268bd2ff", @@ -17,10 +17,10 @@ "2aa198ff", "859900ff" ], "current_score": "586e75ff", - "high_score": "eee8d5ff", + "high_score": "657b83ff", "bonus": "586e75ff", "band": "b58900ff", - "text": "002b36ff" + "text": "fdf6e3ff" }, "cell_texture": "circle.png" } diff --git a/android/assets/themes/theme.list b/android/assets/themes/theme.list index 7fbc883..987fd3c 100644 --- a/android/assets/themes/theme.list +++ b/android/assets/themes/theme.list @@ -4,3 +4,4 @@ bandw underwater solarized-dark solarized-light +darcula