external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare 1.5.19.002 release

Browse Source
This commit is contained in:
drdev
2014-05-29 02:14:46 +00:00
parent c2f92c3a20
commit f110f15877
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-android/pom.xml
View File

@@ -7,7 +7,7 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory> <build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory> <build.max.memory>-Xmx2048m</build.max.memory>
<alpha-version>1.5.19.001</alpha-version> <alpha-version>1.5.19.002</alpha-version>
</properties> </properties>
<parent> <parent>

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -41,7 +41,7 @@ import forge.toolbox.FOverlay;
import forge.util.Utils; import forge.util.Utils;
public class Forge implements ApplicationListener { 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 Clipboard clipboard;
private static int screenWidth; private static int screenWidth;

7
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -8,6 +8,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import forge.Forge;
import forge.Forge.Graphics; import forge.Forge.Graphics;
import forge.assets.FSkin; import forge.assets.FSkin;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
@@ -17,7 +18,6 @@ import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.toolbox.FContainer; import forge.toolbox.FContainer;
import forge.toolbox.FProgressBar; import forge.toolbox.FProgressBar;
import forge.util.BuildInfo;
import forge.util.FileUtil; import forge.util.FileUtil;
import forge.util.TextUtil; import forge.util.TextUtil;
@@ -92,7 +92,6 @@ public class SplashScreen extends FContainer {
private void checkForAssets() { private void checkForAssets() {
if (Gdx.app.getType() == ApplicationType.Desktop) { return; } if (Gdx.app.getType() == ApplicationType.Desktop) { return; }
String versionStr = BuildInfo.getVersionString();
File versionFile = new File(ForgeConstants.ASSETS_DIR + "version.txt"); File versionFile = new File(ForgeConstants.ASSETS_DIR + "version.txt");
if (!versionFile.exists()) { if (!versionFile.exists()) {
try { try {
@@ -103,12 +102,12 @@ public class SplashScreen extends FContainer {
Gdx.app.exit(); //can't continue if this fails 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 return; //if version matches what had been previously saved, no need to download assets
} }
//save version string to file once assets finish downloading //save version string to file once assets finish downloading
//so they don't need to be re-downloaded until you upgrade again //so they don't need to be re-downloaded until you upgrade again
FileUtil.writeFile(versionFile, versionStr); FileUtil.writeFile(versionFile, Forge.CURRENT_VERSION);
} }
} }

15
forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java
View File

@@ -4,26 +4,33 @@ import forge.Forge;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;
import forge.screens.TabPageScreen; import forge.screens.FScreen;
import forge.util.Utils; 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 float INSETS_FACTOR = 0.025f;
public static final FSkinFont DESC_FONT = FSkinFont.get(11); public static final FSkinFont DESC_FONT = FSkinFont.get(11);
public static final FSkinColor DESC_COLOR = FSkinColor.get(Colors.CLR_TEXT).alphaColor(0.5f); 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_HEIGHT = Utils.AVG_FINGER_HEIGHT + Utils.scaleY(12);
protected static final float SETTING_PADDING = Utils.scaleY(5); protected static final float SETTING_PADDING = Utils.scaleY(5);
private final SettingsPage page = add(new SettingsPage());
public SettingsScreen() { public SettingsScreen() {
super(new TabPage[] { super("Settings");
/*super(new TabPage[] {
new SettingsPage(), new SettingsPage(),
new FilesPage(), new FilesPage(),
new HelpPage() new HelpPage()
}); });*/
} }
@Override @Override
public void showMenu() { public void showMenu() {
Forge.back(); //hide settings screen when menu button pressed 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);
}
} }