From 64488ed8135c11069b69a641bcad50c55bcd2f51 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 8 Mar 2022 10:27:50 +0800 Subject: [PATCH] [Mobile] Fix path for fallback_skin --- forge-gui-mobile/src/forge/Forge.java | 2 +- .../src/forge/adventure/scene/PlayerStatisticScene.java | 1 - forge-gui-mobile/src/forge/assets/FSkin.java | 2 +- forge-gui-mobile/src/forge/screens/SplashScreen.java | 4 +--- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 98960d81a4e..317643a6e32 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -339,7 +339,7 @@ public class Forge implements ApplicationListener { protected void afterDbLoaded() { //init here to fix crash if the assets are missing - transitionTexture = new Texture(GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin").child("transition.png") : Gdx.files.classpath("fallback_skin").child("transition.png")); + transitionTexture = new Texture(Gdx.files.classpath("fallback_skin").child("transition.png")); destroyThis = false; //Allow back() diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 7fcee8d10dc..74efeed902c 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -200,7 +200,6 @@ public class PlayerStatisticScene extends UIScene { back.getLabel().setText(Forge.getLocalizer().getMessage("lblBack")); ScrollPane scrollPane = ui.findActor("enemies"); scrollPane.setActor(enemiesGroup); - enemiesGroup.setFillParent(true); this.init = true; } } diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 8f7abc78286..46f4619829d 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -108,7 +108,7 @@ public class FSkin { { if (!dir.exists() || !dir.isDirectory()) { //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen - preferredDir = GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin") : Gdx.files.classpath("fallback_skin"); + preferredDir = Gdx.files.classpath("fallback_skin"); } else { if (splashScreen != null) { diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java index 958fa78dbb1..ce5b40db88f 100644 --- a/forge-gui-mobile/src/forge/screens/SplashScreen.java +++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java @@ -97,9 +97,7 @@ public class SplashScreen extends FContainer { private float progress = 0; private boolean finished, openAdventure; //for transition image only... - TextureRegion transition_bg = new TextureRegion(new Texture(GuiBase.isAndroid() - ? Gdx.files.internal("fallback_skin").child("title_bg_lq.png") - : Gdx.files.classpath("fallback_skin").child("title_bg_lq.png"))); + TextureRegion transition_bg = new TextureRegion(new Texture(Gdx.files.classpath("fallback_skin").child("title_bg_lq.png"))); public void drawBackground(Graphics g) { float percentage = progress / DURATION;