Rename forge.view to forge.app

Alter external storage location

.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

forge-gui-android/AndroidManifest.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="forge.view"
+    package="forge.app"
     android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionName="1.5.18" >
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="19" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
@@ -17,10 +18,8 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

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);
+    }
+}

forge-gui-android/src/forge/view/Main.java

@@ -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);
-    }
-}

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;

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();