Merge pull request #2 from l3ger0j/unstable

Update

Author: l3ger0j

app/build.gradle

@@ -0,0 +1,59 @@
+plugins {
+    alias(libs.plugins.android.application)
+	alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "org.qp.android.questopiabundle"
+    compileSdk = 35
+
+    defaultConfig {
+        applicationId = "org.qp.android.questopiabundle"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 100000
+        versionName = "0.1.0"
+		
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
+    buildFeatures {
+        buildConfig = true
+        aidl = true
+    }
+
+}
+
+dependencies {
+    implementation(project(":libalpha"))
+    implementation(project(":libbravo"))
+    implementation(project(":libcharlie"))
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.constraintlayout)
+
+    implementation(libs.storage)
+    implementation(libs.jsoup)
+
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

app/build.gradle.kts

@@ -2,7 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <queries android:exported="false">
+        <package android:name="com.google.android.documentsui" />
+        <package android:name="com.google.android.apps.docs" />
+        <package android:name="com.android.microdroid.empty_payload" />
+    </queries>
 
     <application
         android:allowBackup="true"
@@ -16,13 +22,14 @@
 
         <service
             android:name=".QuestopiaBundle"
+            android:exported="true"
             android:permission="android.permission.INTERNET"
-            android:process=":remote"
-            android:exported="true">
+            android:process=":remote">
             <intent-filter>
-                <action android:name="org.qp.intent.action.PICK_PLUGIN"/>
+                <action android:name="org.qp.intent.action.PICK_PLUGIN" />
                 <action android:name="org.qp.android.plugin.ENGINE_PLUGIN" />
-                <category android:name="org.qp.intent.category.ADD_PLUGIN"/>
+
+                <category android:name="org.qp.intent.category.ADD_PLUGIN" />
             </intent-filter>
         </service>
 

app/src/main/AndroidManifest.xml

@@ -1,12 +1,12 @@
 package org.qp.android.questopiabundle;
 
+import android.net.Uri;
 import org.qp.android.questopiabundle.LibResult;
 import org.qp.android.questopiabundle.LibException;
 import org.qp.android.questopiabundle.LibDialogRetValue;
 
 interface AsyncCallbacks {
-    void sendLibGameState(in LibResult libResult);
-    void sendLibRef(in LibResult libResult);
+    void updateState(in LibResult refReq, in LibResult newState);
     void sendChangeCurrGameDir(in Uri gameDirUri);
 
     LibDialogRetValue doOnShowDialog(in LibResult typeDialog, String inputString);
@@ -17,5 +17,8 @@ interface AsyncCallbacks {
     void closeFile(String filePath);
     void playFile(String path, int volume);
 
+    Uri requestReceiveFile(in String filePath);
+    Uri requestCreateFile(in Uri fileUri, String path);
+
     void onError(in LibException libException);
 }

app/src/main/aidl/org/qp/android/questopiabundle/AsyncCallbacks.aidl

@@ -0,0 +1,27 @@
+package org.qp.android.questopiabundle
+
+import android.net.Uri
+import org.qp.android.questopiabundle.lib.LibRefIRequest
+import org.qp.android.questopiabundle.lib.LibTypeDialog
+import org.qp.android.questopiabundle.lib.LibTypeWindow
+
+interface GameInterface {
+    fun requestReceiveFile(filePath: String): Uri
+    fun requestCreateFile(dirUri: Uri, path: String): Uri
+    fun isPlayingFile(filePath: String): Boolean
+    fun closeAllFiles()
+    fun closeFile(filePath: String?)
+    fun playFile(path: String?, volume: Int)
+    fun doChangeCurrGameDir(newGameDirUri: Uri?)
+    fun doUpdateState(request: LibRefIRequest)
+    fun showLibDialog(dialog: LibTypeDialog?, inputString: String?): LibDialogRetValue?
+    fun changeVisWindow(type: LibTypeWindow?, show: Boolean)
+    /**
+     * Set the counter location processing interval to `delayMillis` milliseconds.
+     */
+    fun setCountInter(delayMillis: Int)
+    /**
+     * Execute `runnable` without processing the location counter.
+     */
+    fun doWithCounterDisabled(runnable: Runnable?)
+}

app/src/main/java/org/qp/android/questopiabundle/GameInterface.java

@@ -0,0 +1,32 @@
+package org.qp.android.questopiabundle
+
+import android.os.Parcel
+import android.os.Parcelable
+
+data class LibDialogRetValue(
+    val outTextValue: String = "",
+    val outNumValue: Int = 0
+) : Parcelable {
+
+    constructor(source: Parcel) : this(
+        source.readString() ?: "",
+        source.readInt()
+    )
+
+    override fun describeContents(): Int = 0
+
+    override fun writeToParcel(dest: Parcel, flags: Int) {
+        dest.writeString(outTextValue)
+        dest.writeInt(outNumValue)
+    }
+
+    companion object CREATOR : Parcelable.Creator<LibDialogRetValue> {
+        override fun createFromParcel(source: Parcel): LibDialogRetValue {
+            return LibDialogRetValue(source)
+        }
+
+        override fun newArray(size: Int): Array<LibDialogRetValue?> {
+            return arrayOfNulls(size)
+        }
+    }
+}