Skip to content

armgit / andee

Public Imported from GitHub
0

Andee lives on your phone or Mac and uses any app like you do—no integrations, no root, any model; memory and passwords never leave your device | Andee 住进你的手机或 Mac,像你一样操作任何 App——无需集成、无需 Root、支持任意模型,记忆和密码绝不离开设备。

build(core): add a platform-neutral :core module and move the pure files

booboosui88f3be0ffff8
diff --git a/app/build.gradle b/app/build.gradle
index db89b03..b72b9e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.androidApplication)
- id 'org.jetbrains.kotlin.android' version '1.9.22'
+ id 'org.jetbrains.kotlin.android'
}
def localProps = new Properties()
@@ -150,6 +150,8 @@ dependencies {
implementation "androidx.camera:camera-view:$camerax_version"
implementation 'com.google.mlkit:barcode-scanning:17.2.0'
+ implementation project(':core')
+
testImplementation libs.junit
// Unit tests run against android.jar's stubs, whose org.json throws
// "not mocked" on construction. BrainTrace builds a JSONObject before it
diff --git a/build.gradle b/build.gradle
index e61198d..88e829f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.androidApplication) apply false
+id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
+id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false
}
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 0000000..d0ce3de
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,34 @@
+// Platform-neutral Kotlin shared by the Android app and the desktop app: the
+// brain loop, the tool vocabulary, the turn guards, voice protocols, the wake
+// DSP and the ball's model. Nothing here may import android.* — that is the
+// whole point of the module, and the compiler enforces it because android.jar
+// is not on this classpath.
+plugins {
+ id 'org.jetbrains.kotlin.jvm'
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+kotlin {
+ jvmToolchain(17)
+}
+
+compileKotlin {
+ kotlinOptions { jvmTarget = '1.8' }
+}
+compileTestKotlin {
+ kotlinOptions { jvmTarget = '1.8' }
+}
+
+dependencies {
+ // Android ships its own org.json in the framework, and the app must keep
+ // using that one (R8 config and behaviour are tuned to it). So core only
+ // compiles against it; the desktop app adds the real artifact.
+ compileOnly 'org.json:json:20240303'
+
+ testImplementation libs.junit
+ testImplementation 'org.json:json:20240303'
+}
diff --git a/app/src/main/java/net/kuafuai/andee/asr/AsrEngine.kt b/core/src/main/kotlin/net/kuafuai/andee/asr/AsrEngine.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/asr/AsrEngine.kt
rename to core/src/main/kotlin/net/kuafuai/andee/asr/AsrEngine.kt
diff --git a/app/src/main/java/net/kuafuai/andee/brain/SpeechMood.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/SpeechMood.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/brain/SpeechMood.kt
rename to core/src/main/kotlin/net/kuafuai/andee/brain/SpeechMood.kt
diff --git a/app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.kt b/core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.kt
similarity index 99%
rename from app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.kt
rename to core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.kt
index 124b55d..967ae8c 100644
--- a/app/src/main/java/net/kuafuai/andee/brain/TopicSplitter.kt
+++ b/core/src/main/kotlin/net/kuafuai/andee/brain/TopicSplitter.kt
@@ -24,7 +24,7 @@ import org.json.JSONObject
* Pure: no Android, no state, so the rules can be tested directly; see
* `TopicSplitterTest`.
*/
-internal object TopicSplitter {
+object TopicSplitter {
/**
* A silence at least this long is marked in the turn list as a likely seam.
@@ -281,7 +281,7 @@ internal object TopicSplitter {
* device chatter, and a screenshot payload inside a folded topic would be a
* megabyte of base64 with the user's sentence nowhere in it.
*/
-internal fun renderTopicText(history: List<JSONObject>, from: Int, until: Int): String {
+fun renderTopicText(history: List<JSONObject>, from: Int, until: Int): String {
val sb = StringBuilder()
for (i in from.coerceAtLeast(0) until until.coerceAtMost(history.size)) {
val m = history[i]
diff --git a/app/src/main/java/net/kuafuai/andee/config/CronExpr.kt b/core/src/main/kotlin/net/kuafuai/andee/config/CronExpr.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/config/CronExpr.kt
rename to core/src/main/kotlin/net/kuafuai/andee/config/CronExpr.kt
diff --git a/app/src/main/java/net/kuafuai/andee/net/TurnGuards.kt b/core/src/main/kotlin/net/kuafuai/andee/net/TurnGuards.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/net/TurnGuards.kt
rename to core/src/main/kotlin/net/kuafuai/andee/net/TurnGuards.kt
diff --git a/app/src/main/java/net/kuafuai/andee/screen/AimParts.kt b/core/src/main/kotlin/net/kuafuai/andee/screen/AimParts.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/screen/AimParts.kt
rename to core/src/main/kotlin/net/kuafuai/andee/screen/AimParts.kt
diff --git a/app/src/main/java/net/kuafuai/andee/tts/TtsEngine.kt b/core/src/main/kotlin/net/kuafuai/andee/tts/TtsEngine.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/tts/TtsEngine.kt
rename to core/src/main/kotlin/net/kuafuai/andee/tts/TtsEngine.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/Mood.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/Mood.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/Mood.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/Mood.kt
diff --git a/app/src/main/java/net/kuafuai/andee/ui/ball/Pose.kt b/core/src/main/kotlin/net/kuafuai/andee/ui/ball/Pose.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/ui/ball/Pose.kt
rename to core/src/main/kotlin/net/kuafuai/andee/ui/ball/Pose.kt
diff --git a/app/src/main/java/net/kuafuai/andee/wake/Dtw.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/Dtw.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/wake/Dtw.kt
rename to core/src/main/kotlin/net/kuafuai/andee/wake/Dtw.kt
diff --git a/app/src/main/java/net/kuafuai/andee/wake/Mfcc.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/Mfcc.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/wake/Mfcc.kt
rename to core/src/main/kotlin/net/kuafuai/andee/wake/Mfcc.kt
diff --git a/app/src/main/java/net/kuafuai/andee/wake/VoiceSegmenter.kt b/core/src/main/kotlin/net/kuafuai/andee/wake/VoiceSegmenter.kt
similarity index 100%
rename from app/src/main/java/net/kuafuai/andee/wake/VoiceSegmenter.kt
rename to core/src/main/kotlin/net/kuafuai/andee/wake/VoiceSegmenter.kt
diff --git a/app/src/test/java/net/kuafuai/andee/brain/SpeechMoodTest.kt b/core/src/test/kotlin/net/kuafuai/andee/brain/SpeechMoodTest.kt
similarity index 100%
rename from app/src/test/java/net/kuafuai/andee/brain/SpeechMoodTest.kt
rename to core/src/test/kotlin/net/kuafuai/andee/brain/SpeechMoodTest.kt
diff --git a/app/src/test/java/net/kuafuai/andee/brain/TopicSplitterTest.kt b/core/src/test/kotlin/net/kuafuai/andee/brain/TopicSplitterTest.kt
similarity index 100%
rename from app/src/test/java/net/kuafuai/andee/brain/TopicSplitterTest.kt
rename to core/src/test/kotlin/net/kuafuai/andee/brain/TopicSplitterTest.kt
diff --git a/app/src/test/java/net/kuafuai/andee/net/TurnGuardsTest.kt b/core/src/test/kotlin/net/kuafuai/andee/net/TurnGuardsTest.kt
similarity index 100%
rename from app/src/test/java/net/kuafuai/andee/net/TurnGuardsTest.kt
rename to core/src/test/kotlin/net/kuafuai/andee/net/TurnGuardsTest.kt
diff --git a/app/src/test/java/net/kuafuai/andee/wake/WakeDspTest.kt b/core/src/test/kotlin/net/kuafuai/andee/wake/WakeDspTest.kt
similarity index 100%
rename from app/src/test/java/net/kuafuai/andee/wake/WakeDspTest.kt
rename to core/src/test/kotlin/net/kuafuai/andee/wake/WakeDspTest.kt
diff --git a/settings.gradle b/settings.gradle
index 6e570d0..b14b2f2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -24,3 +24,4 @@ dependencyResolutionManagement {
rootProject.name = "body"
include ':app'
+include ':core'