diff --git a/.gitattributes b/.gitattributes index 3114325f129..89a3ad6f68f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -644,8 +644,14 @@ forge-gui-android/gen/forge/view/BuildConfig.java -text forge-gui-android/gen/forge/view/R.java -text forge-gui-android/ic_launcher-web.png -text forge-gui-android/libs/android-support-v4.jar -text +forge-gui-android/libs/armeabi-v7a/libgdx.so -text +forge-gui-android/libs/armeabi/libgdx.so -text forge-gui-android/libs/gdx-backend-android-sources.jar -text forge-gui-android/libs/gdx-backend-android.jar -text +forge-gui-android/libs/gdx-freetype.jar -text +forge-gui-android/libs/gdx-sources.jar -text +forge-gui-android/libs/gdx.jar -text +forge-gui-android/libs/x86/libgdx.so -text forge-gui-android/lint.xml -text forge-gui-android/proguard.cfg -text forge-gui-android/project.properties -text @@ -1186,6 +1192,7 @@ forge-gui-mobile/src/forge/util/LayoutHelper.java -text forge-gui-mobile/src/forge/util/PhysicsObject.java -text forge-gui-mobile/src/forge/util/Utils.java -text forge-gui-mobile/src/forge/util/WaitRunnable.java -text +forge-gui-mobile/src/forge/view/Main.java -text forge-gui/.classpath -text forge-gui/.project -text forge-gui/.settings/org.eclipse.core.resources.prefs -text diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml index f49c019391b..7175b47f0b3 100644 --- a/forge-gui-android/AndroidManifest.xml +++ b/forge-gui-android/AndroidManifest.xml @@ -13,7 +13,7 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" > diff --git a/forge-gui-android/libs/armeabi-v7a/libgdx.so b/forge-gui-android/libs/armeabi-v7a/libgdx.so new file mode 100644 index 00000000000..bd493697131 Binary files /dev/null and b/forge-gui-android/libs/armeabi-v7a/libgdx.so differ diff --git a/forge-gui-android/libs/armeabi/libgdx.so b/forge-gui-android/libs/armeabi/libgdx.so new file mode 100644 index 00000000000..9476a886ed6 Binary files /dev/null and b/forge-gui-android/libs/armeabi/libgdx.so differ diff --git a/forge-gui-android/libs/gdx-freetype.jar b/forge-gui-android/libs/gdx-freetype.jar new file mode 100644 index 00000000000..a89dcf14709 Binary files /dev/null and b/forge-gui-android/libs/gdx-freetype.jar differ diff --git a/forge-gui-android/libs/gdx-sources.jar b/forge-gui-android/libs/gdx-sources.jar new file mode 100644 index 00000000000..72f97a0b116 Binary files /dev/null and b/forge-gui-android/libs/gdx-sources.jar differ diff --git a/forge-gui-android/libs/gdx.jar b/forge-gui-android/libs/gdx.jar new file mode 100644 index 00000000000..4a317606df3 Binary files /dev/null and b/forge-gui-android/libs/gdx.jar differ diff --git a/forge-gui-android/libs/x86/libgdx.so b/forge-gui-android/libs/x86/libgdx.so new file mode 100644 index 00000000000..1abc12aa517 Binary files /dev/null and b/forge-gui-android/libs/x86/libgdx.so differ diff --git a/forge-gui-mobile/.classpath b/forge-gui-mobile/.classpath index ef0e3b83c78..f4c93628fe1 100644 --- a/forge-gui-mobile/.classpath +++ b/forge-gui-mobile/.classpath @@ -6,17 +6,11 @@ - - - - - - - + diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml index ba0793a182e..b6b9a569302 100644 --- a/forge-gui-mobile/pom.xml +++ b/forge-gui-mobile/pom.xml @@ -1,63 +1,128 @@ - - 4.0.0 - forge - forge-gui-mobile - 1.5.18-SNAPSHOT - Forge - - src - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - + + 4.0.0 + + + forge + forge + 1.5.18-SNAPSHOT + + + forge-gui-mobile + apk + Forge + + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.9.0-rc.1 + true + + + true + + + 19 + + true + true + ${project.basedir}/../forge-gui-android/AndroidManifest.xml + ${project.basedir}/../forge-gui-android/assets + ${project.basedir}/../forge-gui-android/res + ${project.basedir}/../forge-gui-android/libs + true + + ${project.basedir}/../forge-gui-android/proguard.cfg + + + + + + + + + com.google.android + android + 4.1.1.4 + provided + + + forge + forge-core + ${project.version} + + + forge + forge-game + ${project.version} + + + forge + forge-ai + ${project.version} + + + forge + forge-net + ${project.version} + + + forge + forge-gui + ${project.version} + + + com.google.guava + guava + 16.0.1 + + + com.thoughtworks.xstream + xstream + 1.4.7 + + + org.apache.commons + commons-lang3 + 3.3 + + + com.badlogicgames.gdx + gdx + 0.9.9 + + + com.badlogicgames.gdx + gdx-freetype + 0.9.9 + + + com.badlogicgames.gdx + gdx-freetype-platform + 0.9.9 + + + xmlpull + xmlpull + 1.1.3.1 + provided + + + com.badlogicgames.gdx + gdx-backend-android + 0.9.9 + + - - - forge - forge-core - ${project.version} - - - forge - forge-game - ${project.version} - - - forge - forge-ai - ${project.version} - - - forge - forge-net - ${project.version} - - - forge - forge-gui - ${project.version} - - - com.google.guava - guava - 16.0.1 - - - com.thoughtworks.xstream - xstream - 1.4.7 - - - org.apache.commons - commons-lang3 - 3.3 - - \ No newline at end of file diff --git a/forge-gui-mobile/src/forge/view/Main.java b/forge-gui-mobile/src/forge/view/Main.java new file mode 100644 index 00000000000..25055ae5c0d --- /dev/null +++ b/forge-gui-mobile/src/forge/view/Main.java @@ -0,0 +1,24 @@ +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()), false); + } +} diff --git a/pom.xml b/pom.xml index 52a5b332ed2..8e623b25328 100644 --- a/pom.xml +++ b/pom.xml @@ -192,6 +192,7 @@ forge-net forge-gui forge-gui-desktop + forge-gui-mobile