Adds the games manager/launcher

.github/workflows/android-cd.yml

@@ -45,29 +45,11 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew app:assembleRelease
 
-    - name: Sign Marathon 2 APKs
-      id: sign_marathon2
+    - name: Sign Aleph One APKs
+      id: sign_alephone
       uses: r0adkll/sign-android-release@v1
       with:
-        releaseDirectory: app/build/outputs/apk/marathon2/release
-        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-        alias: ${{ secrets.ALIAS }}
-        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-        keyPassword: ${{ secrets.KEY_PASSWORD }}
-    - name: Sign Marathon APKs
-      id: sign_marathon
-      uses: r0adkll/sign-android-release@v1
-      with:
-        releaseDirectory: app/build/outputs/apk/marathon/release
-        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-        alias: ${{ secrets.ALIAS }}
-        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-        keyPassword: ${{ secrets.KEY_PASSWORD }}
-    - name: Sign Marathon Infinity APKs
-      id: sign_marathon_inf
-      uses: r0adkll/sign-android-release@v1
-      with:
-        releaseDirectory: app/build/outputs/apk/marathonInfinity/release
+        releaseDirectory: app/build/outputs/apk/release
         signingKeyBase64: ${{ secrets.SIGNING_KEY }}
         alias: ${{ secrets.ALIAS }}
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -85,33 +67,13 @@ jobs:
         draft: true
         prerelease: true
 
-    - name: Upload Marathon
-      id: upload-marathon
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{ steps.sign_marathon.outputs.signedReleaseFile }}
-        asset_name: marathon-signed.apk
-        asset_content_type: application/vnd.android.package-archive
-    - name: Upload Marathon 2
-      id: upload-marathon2
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{ steps.sign_marathon2.outputs.signedReleaseFile }}
-        asset_name: marathon2-signed.apk
-        asset_content_type: application/vnd.android.package-archive
-    - name: Upload Marathon Infinity
-      id: upload-marathonInf
+    - name: Upload Aleph One
+      id: upload_alephone
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{ steps.sign_marathon_inf.outputs.signedReleaseFile }}
-        asset_name: marathon-inf-signed.apk
+        asset_path: ${{ steps.sign_alephone.outputs.signedReleaseFile }}
+        asset_name: alephone-signed.apk
         asset_content_type: application/vnd.android.package-archive

.github/workflows/android.yml

@@ -29,4 +29,4 @@ jobs:
     - name: Uninstall CMake 3.18
       run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --uninstall "cmake;3.18.1" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Build with Gradle
-      run: ./gradlew assembleMarathon2Release
+      run: ./gradlew app:assembleRelease

.gitmodules

@@ -13,15 +13,12 @@
 [submodule "app/src/main/cpp/alephone"]
 	path = app/src/main/cpp/alephone
 	url = [email protected]:daniele-rapagnani/alephone.git
-[submodule "app/src/marathon/assets"]
-	path = app/src/marathon/assets
-	url = [email protected]:Aleph-One-Marathon/data-marathon.git
-[submodule "app/src/marathon2/assets"]
-	path = app/src/marathon2/assets
-	url = [email protected]:Aleph-One-Marathon/data-marathon-2.git
-[submodule "app/src/marathonInfinity/assets"]
-	path = app/src/marathonInfinity/assets
-	url = https://github.com/Aleph-One-Marathon/data-marathon-infinity
 [submodule "SDL2/src/main/cpp/SDL"]
 	path = SDL2/src/main/cpp/SDL
 	url = [email protected]:libsdl-org/SDL.git
+[submodule "vorbis/src/main/cpp/vorbis"]
+	path = vorbis/src/main/cpp/vorbis
+	url = [email protected]:xiph/vorbis.git
+[submodule "vorbis/src/main/cpp/ogg"]
+	path = vorbis/src/main/cpp/ogg
+	url = [email protected]:xiph/ogg.git

app/build.gradle

@@ -10,11 +10,10 @@ android {
     defaultConfig {
         aaptOptions {
             noCompress ''
-            ignoreAssetsPattern 'HD Monsters:HD Textures:HD Weapons:Enhanced HUD:TTEP v7'
         }
 
         applicationId "com.marathon.alephone"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -26,21 +25,6 @@ android {
             }
         }
     }
-    flavorDimensions "games"
-    productFlavors {
-        marathon {
-            dimension "games"
-            applicationId = "com.alephone.marathon"
-        }
-        marathon2 {
-            dimension "games"
-            applicationId = "com.alephone.marathon2"
-        }
-        marathonInfinity {
-            dimension "games"
-            applicationId = "com.alephone.marathoninfinity"
-        }
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -98,11 +82,20 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'commons-io:commons-io:2.6'
+    implementation 'com.google.android.material:material:1.1.0'
+
+    def room_version = "2.3.0"
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
     implementation project(':SDL2')
     implementation project(':SDL_image')
     implementation project(':SDL_mixer')
     implementation project(':SDL_ttf')
     implementation project(':SDL_net')
+    implementation project(':vorbis')
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/AndroidManifest.xml

@@ -11,21 +11,27 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:theme"
+        android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true">
 
         <activity
-            android:name="com.marathon.alephone.MainActivity"
+            android:name="com.marathon.alephone.ScenarioSelectorActivity"
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
-            android:screenOrientation="landscape"
         >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.marathon.alephone.AlephOneActivity"
+            android:screenOrientation="landscape"
+        >
+        </activity>
+
         <activity
             android:name="org.libsdl.app.SDLActivity"
             tools:node="remove"
@@ -35,5 +41,4 @@
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>

app/src/main/cpp/CMakeLists.txt

@@ -139,6 +139,19 @@ set_target_properties(
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/SDL_net/include)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/SDL_net/include)
+
+# Vorbis
+add_library(vorbis SHARED IMPORTED)
+set_target_properties(
+        vorbis PROPERTIES IMPORTED_LOCATION
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/vorbis/lib/${LIB_BUILD_TYPE_DIR}/${CMAKE_ANDROID_ARCH_ABI}/libvorbis.so
+)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/vorbis/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/vorbis/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../../distribution/vorbis/include-built/${LIB_BUILD_TYPE_DIR}/${CMAKE_ANDROID_ARCH_ABI}/ogg/include)
+
 # Boost
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/boost_1_70_0)
 
@@ -147,11 +160,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/boost_1_70_0)
 ###
 
 #add_compile_definitions(HAVE_OPENGL)
+add_compile_definitions(HAVE_VORBISFILE)
 add_compile_definitions(HAVE_UNISTD_H)
 add_compile_definitions(HAVE_LUA)
 add_compile_definitions(HAVE_MEMMOVE)
 add_compile_definitions(HAVE_SDL_IMAGE)
 add_compile_definitions(SDL)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/alephone)
 
-target_link_libraries(main SDL SDL_image SDL_mixer SDL_net png jpeg webp webpdecoder FLAC modplug mpg123 ogg timidity SDL_ttf SDLmain hidapi z android)
+target_link_libraries(main SDL SDL_image SDL_mixer SDL_net png jpeg webp webpdecoder FLAC modplug mpg123 ogg vorbis timidity SDL_ttf SDLmain hidapi z android)

app/src/main/java/com/marathon/alephone/AlephOneActivity.java

@@ -0,0 +1,59 @@
+package com.marathon.alephone;
+
+import android.app.ActionBar;
+import android.content.res.AssetManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+
+import org.libsdl.app.SDLActivity;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class AlephOneActivity extends SDLActivity {
+    private AssetManager am = null;
+
+    public static native void setAssetManager(AssetManager mgr);
+    public static native void setScenarioPath(String path);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        View decorView = getWindow().getDecorView();
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN;
+        decorView.setSystemUiVisibility(uiOptions);
+
+        ActionBar actionBar = getActionBar();
+
+        if (actionBar != null) {
+            actionBar.hide();
+        }
+
+        this.am = getResources().getAssets();
+        setAssetManager(am);
+
+        Bundle b = getIntent().getExtras();
+
+        if (b != null && b.getString("scenarioPath") != null) {
+            setScenarioPath(b.getString("scenarioPath"));
+        }
+    }
+
+    @Override
+    protected String[] getLibraries() {
+        return new String[] {
+            "SDL2",
+            "SDL2_image",
+            "SDL2_mixer",
+            "SDL2_net",
+            "SDL2_ttf",
+            "main"
+        };
+    }
+}