From b2c1ba524779ab51658181be25e012361b74a3d9 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Mon, 30 Dec 2019 15:38:42 +0900
Subject: [PATCH] Android: Add simple launcher

This adds a minimal launcher activity for the android app, which does
the followings:

- Opens a file chooser to let user select a zip file
- Extracts the zip into the app's internal storage
- Launches the SDL activity
---
 android/app/build.gradle                      |  2 +-
 android/app/src/main/AndroidManifest.xml      | 18 ++--
 .../kichikuou/xsystem35/GameActivity.java     | 35 +++++++
 .../kichikuou/xsystem35/LauncherActivity.java | 91 +++++++++++++++++++
 android/app/src/main/res/values/strings.xml   |  2 +-
 src/xsystem35.c                               |  6 ++
 6 files changed, 145 insertions(+), 9 deletions(-)
 create mode 100644 android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.java
 create mode 100644 android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.java

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0623ba6..40a1c01 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -11,7 +11,7 @@ android {
     compileSdkVersion 26
     defaultConfig {
         if (buildAsApplication) {
-            applicationId "org.libsdl.app"
+            applicationId "io.github.kichikuou.xsystem35"
         }
         minSdkVersion 16
         targetSdkVersion 26
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bcd2ede..1f6b6cf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
      com.gamemaker.game
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.libsdl.app"
+    package="io.github.kichikuou.xsystem35"
     android:versionCode="1"
     android:versionName="1.0"
     android:installLocation="auto">
@@ -51,17 +51,21 @@
         <!-- Example of setting SDL hints from AndroidManifest.xml:
         <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
          -->
-     
-        <activity android:name="SDLActivity"
+
+        <activity android:name=".LauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".GameActivity"
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
             <!-- Drop file event -->
             <!--
             <intent-filter>
diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.java b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.java
new file mode 100644
index 0000000..f44d216
--- /dev/null
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.java
@@ -0,0 +1,35 @@
+/* Copyright (C) 2019 <KichikuouChrome@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+*/
+package io.github.kichikuou.xsystem35;
+
+import org.libsdl.app.SDLActivity;
+
+public class GameActivity extends SDLActivity {
+    @Override
+    protected String[] getLibraries() {
+        return new String[] {
+            "hidapi",
+            "SDL2",
+            // "SDL2_image",
+            // "SDL2_mixer",
+            // "SDL2_net",
+            // "SDL2_ttf",
+            "xsystem35"
+        };
+    }
+}
diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.java b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.java
new file mode 100644
index 0000000..bba6ef8
--- /dev/null
+++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.java
@@ -0,0 +1,91 @@
+/* Copyright (C) 2019 <KichikuouChrome@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+*/
+package io.github.kichikuou.xsystem35;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class LauncherActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+        i.setType("application/zip");
+        startActivityForResult(Intent.createChooser(i, "Choose a file"), 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_OK)
+            extractFiles(data.getData(), getApplicationContext().getFilesDir());
+        startGame();
+    }
+
+    boolean extractFiles(Uri zipUri, File outDir) {
+        try {
+            InputStream input = getContentResolver().openInputStream(zipUri);
+            if (input == null)
+                return false;
+            ZipInputStream zip;
+            if (Build.VERSION.SDK_INT >= 24)
+                zip = new ZipInputStream(new BufferedInputStream(input), Charset.forName("Shift_JIS"));
+            else
+                zip = new ZipInputStream(new BufferedInputStream(input));
+            byte[] buffer = new byte[4096];
+            ZipEntry zipEntry;
+            while ((zipEntry = zip.getNextEntry()) != null) {
+                File entryName = new File(zipEntry.getName());
+                if (zipEntry.isDirectory())
+                    continue;
+                Log.d("Extracting", entryName.toString());
+                File outFile = new File(outDir, entryName.getName());
+                BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(outFile));
+                int size;
+                while ((size = zip.read(buffer)) > 0) {
+                    output.write(buffer, 0, size);
+                }
+                output.close();
+            }
+            zip.close();
+            return true;
+        } catch (IOException e) {
+            Log.e("launcher", "Error while extracting zip", e);
+            return false;
+        }
+    }
+
+    void startGame() {
+        Intent i = new Intent();
+        i.setClass(getApplicationContext(), GameActivity.class);
+        startActivity(i);
+    }
+}
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index ab79533..d4535a4 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Game</string>
+    <string name="app_name">xsystem35</string>
 </resources>
diff --git a/src/xsystem35.c b/src/xsystem35.c
index ad39007..5e6a2ad 100644
--- a/src/xsystem35.c
+++ b/src/xsystem35.c
@@ -799,6 +799,12 @@ int main(int argc, char **argv) {
 	
 	saved_argc = argc;
 	saved_argv = argv;
+
+#ifdef __ANDROID__
+	// Chdir to the internal storage path where the launcher should have placed
+	// game files.
+	chdir(SDL_AndroidGetInternalStoragePath());
+#endif
 	
 	load_profile();
 	check_profile();