diff --git a/android/assets/themes/darcula.theme b/android/assets/themes/darcula.theme index fbca7a9..ee860a9 100644 --- a/android/assets/themes/darcula.theme +++ b/android/assets/themes/darcula.theme @@ -8,7 +8,7 @@ "8be9fdff", "ff5555ff", "ff79c6ff", - "ffb86cf" + "ffb86cff" ], "empty_cell": "44475aff", "cells": [ diff --git a/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java b/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java index a4b34f7..50e8027 100644 --- a/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java +++ b/core/src/io/github/lonamiwebs/klooni/actors/ThemeCard.java @@ -100,6 +100,10 @@ public class ThemeCard extends Actor { usedThemeUpdated(); } + public boolean isUsed() { + return Klooni.theme.getName().equals(theme.getName()); + } + void performBuy() { Klooni.buyTheme(theme); use(); diff --git a/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java b/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java index a2371b2..a233b86 100644 --- a/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java +++ b/core/src/io/github/lonamiwebs/klooni/screens/CustomizeScreen.java @@ -144,11 +144,25 @@ class CustomizeScreen implements Screen { themesGroup.addActor(card); } - table.add(new ScrollPane(themesGroup)).expand().fill(); + final ScrollPane themesScroll = new ScrollPane(themesGroup); + table.add(themesScroll).expand().fill(); // Show the current money row table.row(); table.add(buyBand).expandX().fillX(); + + // Scroll to the currently selected theme + table.layout(); + for (Actor a : themesGroup.getChildren()) { + ThemeCard c = (ThemeCard)a; + if (c.isUsed()) { + themesScroll.scrollTo( + c.getX(), c.getY() + c.getHeight(), + c.getWidth(), c.getHeight()); + break; + } + c.usedThemeUpdated(); + } } //endregion