From bf64e177e7b957e8e984482641556b39deb55ca2 Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 8 May 2014 15:07:28 +0000 Subject: [PATCH] Rename forge.view to forge.app Alter external storage location --- .gitattributes | 4 +- forge-gui-android/AndroidManifest.xml | 9 ++-- forge-gui-android/src/forge/app/Main.java | 41 +++++++++++++++++++ forge-gui-android/src/forge/view/Main.java | 24 ----------- .../src/forge/{view => app}/Main.java | 2 +- .../src/forge/screens/SplashScreen.java | 2 - 6 files changed, 48 insertions(+), 34 deletions(-) create mode 100644 forge-gui-android/src/forge/app/Main.java delete mode 100644 forge-gui-android/src/forge/view/Main.java rename forge-gui-mobile-dev/src/forge/{view => app}/Main.java (90%) diff --git a/.gitattributes b/.gitattributes index b3205594e83..dfd28819faf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -667,7 +667,7 @@ forge-gui-android/res/drawable-xhdpi/ic_launcher.png -text forge-gui-android/res/drawable-xxhdpi/ic_launcher.png -text forge-gui-android/res/layout/main.xml -text forge-gui-android/res/values/strings.xml -text -forge-gui-android/src/forge/view/Main.java -text +forge-gui-android/src/forge/app/Main.java -text forge-gui-desktop/.classpath -text forge-gui-desktop/.project -text forge-gui-desktop/.settings/org.eclipse.core.resources.prefs -text @@ -1072,7 +1072,7 @@ forge-gui-mobile-dev/libs/gdx-backend-lwjgl.jar -text forge-gui-mobile-dev/libs/gdx-freetype-natives.jar -text forge-gui-mobile-dev/libs/gdx-natives.jar -text forge-gui-mobile-dev/pom.xml -text -forge-gui-mobile-dev/src/forge/view/Main.java -text +forge-gui-mobile-dev/src/forge/app/Main.java -text forge-gui-mobile/.classpath -text forge-gui-mobile/.project -text forge-gui-mobile/.settings/org.eclipse.jdt.core.prefs -text diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml index 7175b47f0b3..b35430f8c36 100644 --- a/forge-gui-android/AndroidManifest.xml +++ b/forge-gui-android/AndroidManifest.xml @@ -1,12 +1,13 @@ + android:versionName="1.5.18" > + android:targetSdkVersion="19" /> + - - diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java new file mode 100644 index 00000000000..2f3e743ab83 --- /dev/null +++ b/forge-gui-android/src/forge/app/Main.java @@ -0,0 +1,41 @@ +package forge.app; + +import java.io.File; + +import android.content.pm.ActivityInfo; +import android.os.Build; +import android.os.Bundle; +import android.os.Environment; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.backends.android.AndroidApplication; + +import forge.Forge; + +public class Main extends AndroidApplication { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + //setup portrait orientation + this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + if (Build.VERSION.SDK_INT > 8) { //use dual-side portrait mode if supported + this.setRequestedOrientation(7); + } + + //establish assets directory + if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { + Gdx.app.error("Forge", "Can't access external storage"); + Gdx.app.exit(); + return; + } + File assetsDir = new File(Environment.getExternalStorageDirectory() + "/Forge"); + if (!assetsDir.exists() && !assetsDir.mkdirs()) { + Gdx.app.error("Forge", "Can't access external storage"); + Gdx.app.exit(); + return; + } + + initialize(new Forge(getClipboard(), assetsDir.getAbsolutePath() + "/"), false); + } +} diff --git a/forge-gui-android/src/forge/view/Main.java b/forge-gui-android/src/forge/view/Main.java deleted file mode 100644 index 4ff063bb2b0..00000000000 --- a/forge-gui-android/src/forge/view/Main.java +++ /dev/null @@ -1,24 +0,0 @@ -package forge.view; - -import android.content.pm.ActivityInfo; -import android.os.Build; -import android.os.Bundle; - -import com.badlogic.gdx.backends.android.AndroidApplication; - -import forge.Forge; - -public class Main extends AndroidApplication { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - //setup portrait orientation - this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - if (Build.VERSION.SDK_INT > 8) { //use dual-side portrait mode if supported - this.setRequestedOrientation(7); - } - - initialize(new Forge(getClipboard(), getExternalFilesDir(null).getAbsolutePath()), false); - } -} diff --git a/forge-gui-mobile-dev/src/forge/view/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java similarity index 90% rename from forge-gui-mobile-dev/src/forge/view/Main.java rename to forge-gui-mobile-dev/src/forge/app/Main.java index 59166433335..089e4a11fe5 100644 --- a/forge-gui-mobile-dev/src/forge/view/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -1,4 +1,4 @@ -package forge.view; +package forge.app; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglClipboard; diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java index 4519b26e22c..ef37e8bd19e 100644 --- a/forge-gui-mobile/src/forge/screens/SplashScreen.java +++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java @@ -8,7 +8,6 @@ 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; @@ -94,7 +93,6 @@ public class SplashScreen extends FContainer { String versionStr = BuildInfo.getVersionString(); File versionFile = new File(ForgeConstants.ASSETS_DIR + "version.txt"); - Forge.debugPrint("Version file: " + versionFile); if (!versionFile.exists()) { try { versionFile.createNewFile();