Audio indicators computed in koin service

.github/workflows/static.yml

@@ -48,7 +48,8 @@ jobs:
         with:
           key: noisecapturejs
           path: |
-            $GITHUB_WORKSPACE/webApp/build
+            webApp/build
+            shared/build
       - name: Build
         run: >
           ./gradlew

.gitignore

@@ -15,3 +15,4 @@ build/
 .cxx
 local.properties
 venv/
+yarn.lock

androidApp/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
@@ -29,6 +30,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service android:name=".AndroidMeasurementService"
+            android:foregroundServiceType="location|microphone"
+            />
     </application>
 
 </manifest>

androidApp/src/main/kotlin/org/noise_planet/noisecapture/starter/MainActivity.kt

@@ -1,8 +1,13 @@
 package org.noise_planet.noisecapture.starter
 
+import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
 import android.os.Bundle
+import android.os.IBinder
 import androidx.activity.compose.setContent
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import com.bumble.appyx.navigation.integration.NodeActivity
@@ -12,28 +17,86 @@ import org.koin.android.logger.AndroidLogger
 import org.koin.core.context.stopKoin
 import org.koin.dsl.module
 import org.noise_planet.noisecapture.AndroidAudioSource
-import org.noise_planet.noisecapture.AudioSource
+import org.noise_planet.noisecapture.AndroidDatabase
+import org.noise_planet.noisecapture.AndroidMeasurementService
+import org.noise_planet.noisecapture.DatabaseDriverFactory
+import org.noise_planet.noisecapture.shared.MeasurementService
 import org.noise_planet.noisecapture.shared.initKoin
 import org.noise_planet.noisecapture.shared.root.RootNode
 import org.noise_planet.noisecapture.shared.ui.theme.AppyxStarterKitTheme
+import kotlin.reflect.KProperty
 
 class MainActivity : NodeActivity() {
+    val androidLogger = AndroidLogger()
+
+    private val foregroundServiceConnection = ForegroundServiceConnection()
+    internal class ForegroundServiceConnection : ServiceConnection {
+        @SuppressLint("MissingPermission")
+        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+            println("onServiceConnected $name $service")
+            // This is called when the connection with the service has been
+            // established, giving us the service object we can use to
+            // interact with the service.  Because we have bound to a explicit
+            // service that we know is running in our own process, we can
+            // cast its IBinder to a concrete class and directly access it.
+            if(service != null) {
+                val androidMeasurementService =
+                    (service as AndroidMeasurementService.LocalBinder).service
+
+            }
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         stopKoin()
     }
 
+    override fun onRestart() {
+        super.onRestart()
+        println("onRestart")
+    }
+
+    override fun onStop() {
+        super.onStop()
+        println("OnStop")
+    }
+
+    fun onStorageStateChange(property : KProperty<*>, oldValue :Boolean, newValue: Boolean) {
+        // bind this application context to Android Foreground service if storage is launched
+        // in order to avoid application shutdown by Android when moved in background
+        if(newValue) {
+            val intent = Intent(applicationContext, AndroidMeasurementService::class.java)
+            if (applicationContext.bindService(intent, foregroundServiceConnection,
+                    Context.BIND_AUTO_CREATE)) {
+                androidLogger.info("Bind with foreground service")
+            } else{
+                androidLogger.info("Can't bind with foreground service")
+            }
+        } else {
+            applicationContext.unbindService(foregroundServiceConnection)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val koinApplication = initKoin(
             additionalModules = listOf(
                 module {
                     single<Context> { applicationContext }
                     single<Activity> { this@MainActivity }
-                    single<AudioSource> { AndroidAudioSource() }
+                    single<MeasurementService> {
+                        val measurementService = MeasurementService(AndroidAudioSource(logger), androidLogger)
+                        measurementService.storageObservers.add(::onStorageStateChange)
+                        measurementService}
+                    single<DatabaseDriverFactory> { AndroidDatabase(applicationContext) }
                 }
             )
-        ).logger(AndroidLogger())
+        ).logger(androidLogger)
         setContent {
             AppyxStarterKitTheme {
                 NodeHost(

gradle/libs.versions.toml

@@ -5,6 +5,7 @@ agp = "8.1.1"
 android-compile-sdk = "34"
 android-min-sdk = "23"
 android-target-sdk = "32"
+androidDriver = "2.0.1"
 androidx-activity-compose = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-test-espresso-core = "3.5.1"
@@ -25,8 +26,11 @@ appcompat = "1.6.1"
 kotxresources= "0.4.0"
 kotxdatetime = "0.5.0"
 kotlinWrappersVersion = "1.0.0-pre.700"
+sqliteFramework = "2.4.0"
 
 [libraries]
+androidx-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqliteFramework" }
+sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "androidDriver" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
@@ -49,5 +53,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 kotlinx-resources-test =  { module = "com.goncalossilva:resources", version.ref = "kotxresources" }
 kotlinx-datetime =  { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotxdatetime" }
 kotlin-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version.ref = "kotlinWrappersVersion" }
+sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "androidDriver" }
+sqldelight-driver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "androidDriver" }