Skip to content

Commit 00b92c3

Browse files
committed
fix Tutorial on Android
1 parent f4f30cd commit 00b92c3

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

core/src/main/java/de/sesu8642/feudaltactics/lib/gamestate/ScenarioGameStateLoader.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package de.sesu8642.feudaltactics.lib.gamestate;
22

3+
import com.badlogic.gdx.Gdx;
4+
import com.badlogic.gdx.files.FileHandle;
35
import com.badlogic.gdx.utils.Json;
46
import com.badlogic.gdx.utils.JsonReader;
57
import com.badlogic.gdx.utils.JsonValue;
68
import com.badlogic.gdx.utils.JsonWriter.OutputType;
7-
import com.google.common.io.Resources;
8-
import de.sesu8642.feudaltactics.exceptions.FatalErrorException;
99

10-
import java.io.IOException;
11-
import java.net.URL;
1210
import java.nio.charset.StandardCharsets;
1311

1412
/**
@@ -30,13 +28,9 @@ public ScenarioGameStateLoader() {
3028
* @return loaded gameState
3129
*/
3230
public GameState loadScenarioGameState(ScenarioMap scenarioMap) {
33-
URL url = Resources.getResource(scenarioMap.mapPath);
34-
String loadedString = null;
35-
try {
36-
loadedString = Resources.toString(url, StandardCharsets.UTF_8);
37-
} catch (IOException e) {
38-
throw new FatalErrorException("Unable to load scenario map from " + scenarioMap.mapPath);
39-
}
31+
FileHandle assetsFileHandle = Gdx.files.internal(scenarioMap.mapPath);
32+
String loadedString = assetsFileHandle.readString(StandardCharsets.UTF_8.name());
33+
4034
JsonValue loadedStateJsonValue = jsonReader.parse(loadedString);
4135
return json.readValue(GameState.class, loadedStateJsonValue);
4236
}

core/src/main/java/de/sesu8642/feudaltactics/menu/common/ui/FeudalTacticsDialog.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public class FeudalTacticsDialog extends Dialog {
1818
public static final float DIALOG_PADDING = 20;
1919
public static final float DIALOG_LABEL_MAX_WIDTH = 600;
2020

21-
private static final float MAX_RESPONSIVE_SMALL_IMAGE_WIDTH = Gdx.graphics.getDensity() * 150F;
22-
2321
private final Skin skin;
2422

2523
/**
@@ -97,14 +95,11 @@ public FeudalTacticsDialog addTable(List<List<String>> data) {
9795
*/
9896
public FeudalTacticsDialog addButtonImage(String spriteName) {
9997
Sprite sprite = skin.getSprite(spriteName);
100-
float aspectRatio = sprite.getHeight() / sprite.getWidth();
10198
Image image = new Image(sprite);
10299
image.setColor(skin.getColor(SkinConstants.COLOR_HIGHLIGHT2));
103-
this.getContentTable().add(image).prefWidth(0).maxWidth(MAX_RESPONSIVE_SMALL_IMAGE_WIDTH)
104-
.height(Value.percentWidth(aspectRatio))
105-
.expand().fill();
100+
this.getContentTable().add(image).size(Value.percentWidth(0.2F, this.getContentTable()));
106101
this.getContentTable().row();
107102
return this;
108103
}
109-
104+
110105
}

0 commit comments

Comments
 (0)