diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index a5296e86230..eeb6ab970d6 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -104,6 +104,7 @@ public class Forge implements ApplicationListener { public static boolean isTabletDevice = false; public static String locale = "en-US"; public Assets assets; + private ForgePreferences forgePreferences; public static boolean hdbuttons = false; public static boolean hdstart = false; public static boolean isPortraitMode = false; @@ -145,6 +146,11 @@ public class Forge implements ApplicationListener { private Forge() { } + private ForgePreferences getForgePreferences() { + if (forgePreferences == null) + forgePreferences = new ForgePreferences(); + return forgePreferences; + } public static Localizer getLocalizer() { if (localizer == null) localizer = Localizer.getInstance(); @@ -179,31 +185,30 @@ public class Forge implements ApplicationListener { */ Gdx.input.setCatchKey(Keys.BACK, true); destroyThis = true; //Prevent back() - ForgePreferences prefs = new ForgePreferences(); if (Files.exists(Paths.get(ForgeConstants.DEFAULT_SKINS_DIR+ForgeConstants.ADV_TEXTURE_BG_FILE))) - selector = prefs.getPref(FPref.UI_SELECTOR_MODE); + selector = getForgePreferences().getPref(FPref.UI_SELECTOR_MODE); boolean landscapeMode = GuiBase.isAndroid() ? !isPortraitMode : screenWidth > screenHeight; //update landscape mode preference if it doesn't match what the app loaded as - if (prefs.getPrefBoolean(FPref.UI_LANDSCAPE_MODE) != landscapeMode) { - prefs.setPref(FPref.UI_LANDSCAPE_MODE, landscapeMode); - prefs.save(); + if (getForgePreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE) != landscapeMode) { + getForgePreferences().setPref(FPref.UI_LANDSCAPE_MODE, landscapeMode); + getForgePreferences().save(); } String skinName; if (FileUtil.doesFileExist(ForgeConstants.MAIN_PREFS_FILE)) { - skinName = prefs.getPref(FPref.UI_SKIN); + skinName = getForgePreferences().getPref(FPref.UI_SKIN); } else { skinName = "default"; //use default skin if preferences file doesn't exist yet } FSkin.loadLight(skinName, splashScreen); - textureFiltering = prefs.getPrefBoolean(FPref.UI_LIBGDX_TEXTURE_FILTERING); - showFPS = prefs.getPrefBoolean(FPref.UI_SHOW_FPS); - autoAIDeckSelection = prefs.getPrefBoolean(FPref.UI_AUTO_AIDECK_SELECTION); - altPlayerLayout = prefs.getPrefBoolean(FPref.UI_ALT_PLAYERINFOLAYOUT); - altZoneTabs = prefs.getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS); - animatedCardTapUntap = prefs.getPrefBoolean(FPref.UI_ANIMATED_CARD_TAPUNTAP); - enableUIMask = prefs.getPref(FPref.UI_ENABLE_BORDER_MASKING); - if (prefs.getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("true")) //override old settings if not updated + textureFiltering = getForgePreferences().getPrefBoolean(FPref.UI_LIBGDX_TEXTURE_FILTERING); + showFPS = getForgePreferences().getPrefBoolean(FPref.UI_SHOW_FPS); + autoAIDeckSelection = getForgePreferences().getPrefBoolean(FPref.UI_AUTO_AIDECK_SELECTION); + altPlayerLayout = getForgePreferences().getPrefBoolean(FPref.UI_ALT_PLAYERINFOLAYOUT); + altZoneTabs = getForgePreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS); + animatedCardTapUntap = getForgePreferences().getPrefBoolean(FPref.UI_ANIMATED_CARD_TAPUNTAP); + enableUIMask = getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING); + if (getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("true")) //override old settings if not updated enableUIMask = "Full"; else if (prefs.getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("false")) enableUIMask = "Off";