diff --git a/build.gradle b/build.gradle
index 003cd9c4097f8ab896929e4f4b6666a8a3009aa4..712c677178f15db44e77bdfe699acbd2a88335c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,6 @@ allprojects {
sqlDroidVersion = '1.0.3'
sqlLiteJdbcVersion = '3.8.10.1'
guavaVersion = '18.0'
- gsonVersion = '2.3.1'
jacksonVersion = '2.6.1'
}
@@ -371,7 +370,6 @@ project(":core") {
compile "net.engio:mbassador:$mbassadorVersion"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compile "com.google.guava:guava:$guavaVersion"
- compile "com.google.code.gson:gson:$gsonVersion"
compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
diff --git a/core/assets/cs/screen/encyclopedia/daytime.png b/core/assets/common/screen/encyclopedia/gfx/daytime.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/daytime.png
rename to core/assets/common/screen/encyclopedia/gfx/daytime.png
diff --git a/core/assets/cs/screen/encyclopedia/keyboard.png b/core/assets/common/screen/encyclopedia/gfx/keyboard.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/keyboard.png
rename to core/assets/common/screen/encyclopedia/gfx/keyboard.png
diff --git a/core/assets/cs/screen/encyclopedia/orientation_points.png b/core/assets/common/screen/encyclopedia/gfx/orientation_points.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/orientation_points.png
rename to core/assets/common/screen/encyclopedia/gfx/orientation_points.png
diff --git a/core/assets/cs/screen/encyclopedia/text_correction.png b/core/assets/common/screen/encyclopedia/gfx/text_correction.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/text_correction.png
rename to core/assets/common/screen/encyclopedia/gfx/text_correction.png
diff --git a/core/assets/cs/screen/encyclopedia/time_for_work.png b/core/assets/common/screen/encyclopedia/gfx/time_for_work.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/time_for_work.png
rename to core/assets/common/screen/encyclopedia/gfx/time_for_work.png
diff --git a/core/assets/cs/screen/encyclopedia/verbal_skills.png b/core/assets/common/screen/encyclopedia/gfx/verbal_skills.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/verbal_skills.png
rename to core/assets/common/screen/encyclopedia/gfx/verbal_skills.png
diff --git a/core/assets/cs/screen/encyclopedia/work_procedure.png b/core/assets/common/screen/encyclopedia/gfx/work_procedure.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/work_procedure.png
rename to core/assets/common/screen/encyclopedia/gfx/work_procedure.png
diff --git a/core/assets/cs/screen/encyclopedia/audiobook.png b/core/assets/cs/screen/encyclopedia/gfx/audiobook.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/audiobook.png
rename to core/assets/cs/screen/encyclopedia/gfx/audiobook.png
diff --git a/core/assets/cs/screen/encyclopedia/book.png b/core/assets/cs/screen/encyclopedia/gfx/book.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/book.png
rename to core/assets/cs/screen/encyclopedia/gfx/book.png
diff --git a/core/assets/cs/screen/encyclopedia/external_memory.png b/core/assets/cs/screen/encyclopedia/gfx/external_memory.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/external_memory.png
rename to core/assets/cs/screen/encyclopedia/gfx/external_memory.png
diff --git a/core/assets/cs/screen/encyclopedia/grammar.png b/core/assets/cs/screen/encyclopedia/gfx/grammar.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/grammar.png
rename to core/assets/cs/screen/encyclopedia/gfx/grammar.png
diff --git a/core/assets/cs/screen/encyclopedia/logical_groups.png b/core/assets/cs/screen/encyclopedia/gfx/logical_groups.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/logical_groups.png
rename to core/assets/cs/screen/encyclopedia/gfx/logical_groups.png
diff --git a/core/assets/cs/screen/encyclopedia/senses.png b/core/assets/cs/screen/encyclopedia/gfx/senses.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/senses.png
rename to core/assets/cs/screen/encyclopedia/gfx/senses.png
diff --git a/core/assets/cs/screen/encyclopedia/word_memorization.png b/core/assets/cs/screen/encyclopedia/gfx/word_memorization.png
similarity index 100%
rename from core/assets/cs/screen/encyclopedia/word_memorization.png
rename to core/assets/cs/screen/encyclopedia/gfx/word_memorization.png
diff --git a/core/assets/de/screen/encyclopedia/daytime.png b/core/assets/de/screen/encyclopedia/daytime.png
deleted file mode 100644
index 6fb766c2c25539abc871e3f7b32395e8bf5411df..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/daytime.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/audiobook.png b/core/assets/de/screen/encyclopedia/gfx/audiobook.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/audiobook.png
rename to core/assets/de/screen/encyclopedia/gfx/audiobook.png
diff --git a/core/assets/de/screen/encyclopedia/book.png b/core/assets/de/screen/encyclopedia/gfx/book.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/book.png
rename to core/assets/de/screen/encyclopedia/gfx/book.png
diff --git a/core/assets/de/screen/encyclopedia/external_memory.png b/core/assets/de/screen/encyclopedia/gfx/external_memory.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/external_memory.png
rename to core/assets/de/screen/encyclopedia/gfx/external_memory.png
diff --git a/core/assets/de/screen/encyclopedia/grammar.png b/core/assets/de/screen/encyclopedia/gfx/grammar.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/grammar.png
rename to core/assets/de/screen/encyclopedia/gfx/grammar.png
diff --git a/core/assets/de/screen/encyclopedia/logical_groups.png b/core/assets/de/screen/encyclopedia/gfx/logical_groups.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/logical_groups.png
rename to core/assets/de/screen/encyclopedia/gfx/logical_groups.png
diff --git a/core/assets/de/screen/encyclopedia/senses.png b/core/assets/de/screen/encyclopedia/gfx/senses.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/senses.png
rename to core/assets/de/screen/encyclopedia/gfx/senses.png
diff --git a/core/assets/de/screen/encyclopedia/word_memorization.png b/core/assets/de/screen/encyclopedia/gfx/word_memorization.png
similarity index 100%
rename from core/assets/de/screen/encyclopedia/word_memorization.png
rename to core/assets/de/screen/encyclopedia/gfx/word_memorization.png
diff --git a/core/assets/de/screen/encyclopedia/keyboard.png b/core/assets/de/screen/encyclopedia/keyboard.png
deleted file mode 100644
index 40f763a2f7dd4dc3be49ccb0f25b393866e64fb4..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/keyboard.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/orientation_points.png b/core/assets/de/screen/encyclopedia/orientation_points.png
deleted file mode 100644
index 0566853f7e063417404ccf040524cf3a50a2e6b6..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/orientation_points.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/text_correction.png b/core/assets/de/screen/encyclopedia/text_correction.png
deleted file mode 100644
index 95a040bc96b6081ce9d379efb5a16f12ea9fe123..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/text_correction.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/time_for_work.png b/core/assets/de/screen/encyclopedia/time_for_work.png
deleted file mode 100644
index 2f48e04d889dc77aa4a93256fe4e797d7acf4c90..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/time_for_work.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/verbal_skills.png b/core/assets/de/screen/encyclopedia/verbal_skills.png
deleted file mode 100644
index 192b55161f8798cb51fb39137c09997940596161..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/verbal_skills.png and /dev/null differ
diff --git a/core/assets/de/screen/encyclopedia/work_procedure.png b/core/assets/de/screen/encyclopedia/work_procedure.png
deleted file mode 100644
index b10403af8e753e970f1aa759e53960278c6c1a11..0000000000000000000000000000000000000000
Binary files a/core/assets/de/screen/encyclopedia/work_procedure.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/daytime.png b/core/assets/sk/screen/encyclopedia/daytime.png
deleted file mode 100644
index 6fb766c2c25539abc871e3f7b32395e8bf5411df..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/daytime.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/audiobook.png b/core/assets/sk/screen/encyclopedia/gfx/audiobook.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/audiobook.png
rename to core/assets/sk/screen/encyclopedia/gfx/audiobook.png
diff --git a/core/assets/sk/screen/encyclopedia/book.png b/core/assets/sk/screen/encyclopedia/gfx/book.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/book.png
rename to core/assets/sk/screen/encyclopedia/gfx/book.png
diff --git a/core/assets/sk/screen/encyclopedia/external_memory.png b/core/assets/sk/screen/encyclopedia/gfx/external_memory.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/external_memory.png
rename to core/assets/sk/screen/encyclopedia/gfx/external_memory.png
diff --git a/core/assets/sk/screen/encyclopedia/grammar.png b/core/assets/sk/screen/encyclopedia/gfx/grammar.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/grammar.png
rename to core/assets/sk/screen/encyclopedia/gfx/grammar.png
diff --git a/core/assets/sk/screen/encyclopedia/logical_groups.png b/core/assets/sk/screen/encyclopedia/gfx/logical_groups.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/logical_groups.png
rename to core/assets/sk/screen/encyclopedia/gfx/logical_groups.png
diff --git a/core/assets/sk/screen/encyclopedia/senses.png b/core/assets/sk/screen/encyclopedia/gfx/senses.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/senses.png
rename to core/assets/sk/screen/encyclopedia/gfx/senses.png
diff --git a/core/assets/sk/screen/encyclopedia/word_memorization.png b/core/assets/sk/screen/encyclopedia/gfx/word_memorization.png
similarity index 100%
rename from core/assets/sk/screen/encyclopedia/word_memorization.png
rename to core/assets/sk/screen/encyclopedia/gfx/word_memorization.png
diff --git a/core/assets/sk/screen/encyclopedia/keyboard.png b/core/assets/sk/screen/encyclopedia/keyboard.png
deleted file mode 100644
index 40f763a2f7dd4dc3be49ccb0f25b393866e64fb4..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/keyboard.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/orientation_points.png b/core/assets/sk/screen/encyclopedia/orientation_points.png
deleted file mode 100644
index 0566853f7e063417404ccf040524cf3a50a2e6b6..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/orientation_points.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/text_correction.png b/core/assets/sk/screen/encyclopedia/text_correction.png
deleted file mode 100644
index 95a040bc96b6081ce9d379efb5a16f12ea9fe123..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/text_correction.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/time_for_work.png b/core/assets/sk/screen/encyclopedia/time_for_work.png
deleted file mode 100644
index 2f48e04d889dc77aa4a93256fe4e797d7acf4c90..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/time_for_work.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/verbal_skills.png b/core/assets/sk/screen/encyclopedia/verbal_skills.png
deleted file mode 100644
index 192b55161f8798cb51fb39137c09997940596161..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/verbal_skills.png and /dev/null differ
diff --git a/core/assets/sk/screen/encyclopedia/work_procedure.png b/core/assets/sk/screen/encyclopedia/work_procedure.png
deleted file mode 100644
index b10403af8e753e970f1aa759e53960278c6c1a11..0000000000000000000000000000000000000000
Binary files a/core/assets/sk/screen/encyclopedia/work_procedure.png and /dev/null differ
diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
index e5a671e19161b65090bb020da5dac58de7db8a3d..56b5296b3ff6b3665e9cd00d9370c8d4fa3a3d0f 100644
--- a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
+++ b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
@@ -14,14 +14,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
import com.badlogic.gdx.scenes.scene2d.ui.Stack;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align;
-import com.badlogic.gdx.utils.Array;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import net.dermetfan.utils.Pair;
import java.util.List;
import java.util.Map;
@@ -33,7 +27,6 @@ import cz.nic.tablexia.screen.encyclopedia.assets.EncyclopediaAssets;
import cz.nic.tablexia.screen.encyclopedia.content.ContentParser;
import cz.nic.tablexia.screen.encyclopedia.content.model.Content;
import cz.nic.tablexia.screen.encyclopedia.content.model.Header;
-import cz.nic.tablexia.screen.encyclopedia.content.model.TextContent;
import cz.nic.tablexia.screen.encyclopedia.menu.MenuItem;
import cz.nic.tablexia.screen.encyclopedia.menu.MenuWidget;
import cz.nic.tablexia.screen.encyclopedia.widget.ResizableScrollPane;
@@ -98,7 +91,6 @@ public class EncyclopediaScreen extends AbstractTablexiaScreen<Void> {
private void prepareRightMenu() {
float rightPanelWidth = (1 - CONTENT_RELATIVE_WIDTH) * SCREEN_SIZE.x;
- Array<MenuItem> menuItems = new Array<MenuItem>(MenuItem.values());
menu = new MenuWidget(this, new Point(rightPanelWidth, SCREEN_SIZE.y * MENU_RELATIVE_HEIGHT), EncyclopediaAssets.BOOKMARK, new MenuWidget.OnMenuItemClickListener() {
@Override
public void onMenuItemClicked(MenuItem clickedMenuItem) {
diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/content/ContentParser.java b/core/src/cz/nic/tablexia/screen/encyclopedia/content/ContentParser.java
index 6b2bf4085aa70ab21eccb8f01a1bc7991809a6c7..43f073ced4a8da36bfc9f8a1534264c090e29484 100644
--- a/core/src/cz/nic/tablexia/screen/encyclopedia/content/ContentParser.java
+++ b/core/src/cz/nic/tablexia/screen/encyclopedia/content/ContentParser.java
@@ -2,11 +2,8 @@ package cz.nic.tablexia.screen.encyclopedia.content;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.screen.encyclopedia.content.model.Content;
diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/ImageContent.java b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/ImageContent.java
index 091cf667d85334e7cdba68961272151af5e022d4..e28f4394d99bc000a67ac600185029bcee3dcae7 100644
--- a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/ImageContent.java
+++ b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/ImageContent.java
@@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup;
import cz.nic.tablexia.game.games.pursuit.model.Point;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
+import cz.nic.tablexia.screen.encyclopedia.assets.EncyclopediaAssets;
/**
* Created by Václav TarantÃk on 3.9.15.
@@ -23,7 +24,7 @@ public class ImageContent implements Content {
@Override
public Actor render(AbstractTablexiaScreen screen,float parentContainerWidth) {
- return new Image(screen.getScreenTextureRegion(image));
+ return new Image(screen.getScreenTextureRegion(EncyclopediaAssets.GFX_PATH+image));
}
public String getImage() {