From f110f1587716e736ae5b0571c335e4126f10ef2d Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 29 May 2014 02:14:46 +0000 Subject: [PATCH] Prepare 1.5.19.002 release --- forge-gui-android/pom.xml | 2 +- forge-gui-mobile/src/forge/Forge.java | 2 +- .../src/forge/screens/SplashScreen.java | 7 +++---- .../forge/screens/settings/SettingsScreen.java | 15 +++++++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 80491eb09aa..eb3b0951dfc 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -7,7 +7,7 @@ jar -Xms128m -Xmx2048m - 1.5.19.001 + 1.5.19.002 diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 3d213466be1..084f3c5c3c9 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -41,7 +41,7 @@ import forge.toolbox.FOverlay; import forge.util.Utils; public class Forge implements ApplicationListener { - public static final String CURRENT_VERSION = "1.5.19.001"; + public static final String CURRENT_VERSION = "1.5.19.002"; private static Clipboard clipboard; private static int screenWidth; diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java index bfe6da60343..e9191bf34c5 100644 --- a/forge-gui-mobile/src/forge/screens/SplashScreen.java +++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java @@ -8,6 +8,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import forge.Forge; import forge.Forge.Graphics; import forge.assets.FSkin; import forge.assets.FSkinFont; @@ -17,7 +18,6 @@ import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.toolbox.FContainer; import forge.toolbox.FProgressBar; -import forge.util.BuildInfo; import forge.util.FileUtil; import forge.util.TextUtil; @@ -92,7 +92,6 @@ public class SplashScreen extends FContainer { private void checkForAssets() { if (Gdx.app.getType() == ApplicationType.Desktop) { return; } - String versionStr = BuildInfo.getVersionString(); File versionFile = new File(ForgeConstants.ASSETS_DIR + "version.txt"); if (!versionFile.exists()) { try { @@ -103,12 +102,12 @@ public class SplashScreen extends FContainer { Gdx.app.exit(); //can't continue if this fails } } - else if (versionStr.equals(TextUtil.join(FileUtil.readFile(versionFile), "\n"))) { + else if (Forge.CURRENT_VERSION.equals(TextUtil.join(FileUtil.readFile(versionFile), "\n"))) { return; //if version matches what had been previously saved, no need to download assets } //save version string to file once assets finish downloading //so they don't need to be re-downloaded until you upgrade again - FileUtil.writeFile(versionFile, versionStr); + FileUtil.writeFile(versionFile, Forge.CURRENT_VERSION); } } diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java index 83e457e6160..ec1e2a86361 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java @@ -4,26 +4,33 @@ import forge.Forge; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinColor.Colors; -import forge.screens.TabPageScreen; +import forge.screens.FScreen; import forge.util.Utils; -public class SettingsScreen extends TabPageScreen { +public class SettingsScreen extends FScreen { public static final float INSETS_FACTOR = 0.025f; public static final FSkinFont DESC_FONT = FSkinFont.get(11); public static final FSkinColor DESC_COLOR = FSkinColor.get(Colors.CLR_TEXT).alphaColor(0.5f); protected static final float SETTING_HEIGHT = Utils.AVG_FINGER_HEIGHT + Utils.scaleY(12); protected static final float SETTING_PADDING = Utils.scaleY(5); + private final SettingsPage page = add(new SettingsPage()); public SettingsScreen() { - super(new TabPage[] { + super("Settings"); + /*super(new TabPage[] { new SettingsPage(), new FilesPage(), new HelpPage() - }); + });*/ } @Override public void showMenu() { Forge.back(); //hide settings screen when menu button pressed } + + @Override + protected void doLayout(float startY, float width, float height) { + page.setBounds(0, startY, width, height - startY); + } }