Merge branch 'andy_tandem_dev' into andy_tandem

Author: andy-rozman-beyondnow

.circleci/config.yml

@@ -1,4 +1,4 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine. 
+ # Use the latest 2.1 version of CircleCI pipeline process engine. 
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
@@ -19,21 +19,21 @@ jobs:
       - run:
           name: Create avd
           command: |
-            echo "no" | /opt/android-sdk/cmdline-tools/latest/bin/avdmanager --verbose create avd -n citest -k "system-images;android-30;google_apis_playstore;x86" --force
+            echo "no" | /usr/lib/android-sdk/cmdline-tools/13.0/bin/avdmanager --verbose create avd -n citest -k "system-images;android-31;google_apis_playstore;x86_64" --force
 
       - run:
           name: Launch emulator
           command: |
-            export ANDROID_SDK_ROOT=/opt/android-sdk
-            export ANDROID_HOME=/opt/android-sdk
+            export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+            export ANDROID_HOME=/usr/lib/android-sdk
             emulator -avd citest -delay-adb -verbose -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim
           background: true
 
       - run:
           name: Run connectedFullDebugAndroidTest
           command: |
-            export ANDROID_SDK_ROOT=/opt/android-sdk
-            export ANDROID_HOME=/opt/android-sdk
+            export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+            export ANDROID_HOME=/usr/lib/android-sdk
             env
             ./gradlew -Dorg.gradle.jvmargs=-Xmx6g connectedFullDebugAndroidTest
           
@@ -46,15 +46,15 @@ jobs:
       - run:
           name: Run testFullDebugUnitTest
           command: |
-            export ANDROID_SDK_ROOT=/opt/android-sdk
-            export ANDROID_HOME=/opt/android-sdk
+            export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+            export ANDROID_HOME=/usr/lib/android-sdk
             ./gradlew -Dorg.gradle.jvmargs=-Xmx6g testFullDebugUnitTest
 
       - run:
           run: Run jacocoAllDebugReport
           command: |
-            export ANDROID_SDK_ROOT=/opt/android-sdk
-            export ANDROID_HOME=/opt/android-sdk
+            export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+            export ANDROID_HOME=/usr/lib/android-sdk
             ./gradlew --stacktrace jacocoAllDebugReport
 
       - run:
@@ -73,6 +73,12 @@ jobs:
       - codecov/upload:
           file: './build/reports/jacoco/jacocoAllDebugReport/jacocoAllDebugReport.xml'
 
+      - run:
+          name: Kill java processes
+          command: |
+            killall java
+          when: always
+
 workflows:
   # Below is the definition of your workflow.
   # Inside the workflow, you provide the jobs you want to run, e.g this workflow runs the build-and-test job above.

.kotlin/errors/errors-1730369688333.log

@@ -46,3 +46,129 @@ Hints
 * For new features, make sure there is Issue to track progress and have on-topic discussion
 * Reach out to community, discuss idea on Discord (https://discord.gg/4fQUWHZ4Mw)
 * Speak with other developers to minimize merge conflicts. Find out who worked, working or plan to work on specific issue or part of app
+
+
+New Jetpack Compose UI
+========================
+
+Integrating with Dagger
+------------------------
+When using new Compose API, you need to use ComponentActivity in which you put your content. This wouldn't really be
+problem by itself, but together with Dagger you get a little bit of mess, since you will need at least few
+classes injected.
+
+Solution is done with dagger.Subcompoents and bindings (everything is done only on module level).
+
+Solution requires to create 1 new class in your module, something like this:
+
+@Subcomponent
+interface TandemComposeUiComponent : ComposeUi {
+    fun inject(activity: ActionsActivity)
+    fun inject(activity: DataActivity)
+    fun inject(activity: PairingActivity)
+
+
+    @Subcomponent.Factory
+    interface FactoryCompose : ComposeUiFactory {
+        override fun create(): TandemComposeUiComponent
+    }
+}
+
+
+For your solution you just need to change the name and insert "fun inject()" for each activity. So in this module we
+have 3 specific "main" activities. The way Compose works is that you need just the starting point and all sub-windows
+are just Compose elements, so you just need "entry" activity.
+
+Next change that is required is entry in your Dagger Module file:
+
+
+    @Binds
+    @IntoMap
+    @ComposeUiModule("tandem")
+    abstract fun bindTandemComposeUiFactory(factory: TandemComposeUiComponent.FactoryCompose): ComposeUiFactory
+
+ComposeUiModule name needs to be unique across whole app, so using driver name (in case of pump driver) is a
+good solution.
+
+Also on main Module file you need to specify subComponent you created
+
+@Module(subcomponents = [TandemComposeUiComponent::class])
+
+
+
+Now in every ComposeActivity, you need to do following:
+
+1. you activity needs to extend DaggerComponentActivity (DaggerComponentActivity is just marker class that tells dagger
+what to inject, it is just abstract class that extends ComponentActivity), and next step is of course to add all
+your injects...
+
+So something like:
+
+	@Inject lateinit var aapsLogger: AAPSLogger
+
+
+2. final change is to add following code onCreate:
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val composeUiComponent = (application as ComposeUiProvider)
+            .getComposeUiModule("tandem") as TandemComposeUiComponent
+
+        composeUiComponent.inject(this)
+
+        // .... other code
+
+        enableEdgeToEdge()
+        setContent {
+
+			// ... Compose Ui Code (elements with @Composable attribute)
+
+        }
+     }
+
+
+Basic setup in module
+------------------------
+
+1.) Other config
+
+android {
+
+    buildFeatures {
+        compose=true
+    }
+}
+
+2.) Plugins
+
+plugins {
+    alias(libs.plugins.compose.compiler)
+}
+
+3.) Dependencies
+
+Mostly depends what you need:
+
+Required:
+
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+
+Preview: (last 2 needed for preview, first two might be needed always)
+
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling)
+    implementation(libs.androidx.ui.tooling.preview)
+
+Others:
+
+    implementation(libs.androidx.compose.material3)   // Material 3 interface
+    implementation(libs.androidx.compose.material)    // Material interface (both interfaces shouldn't be mixed, at least not in same screen)
+    implementation(libs.androidx.compose.foundation)  // base classes
+
+    implementation(libs.androidx.lifecycle.runtime.compose) // if you will use livedata and lifecyles
+    implementation(libs.androidx.compose.runtime.livedata)
+
+    implementation(libs.androidx.compose.navigation)  // if you use navigation models

CONTRIBUTING.md

@@ -19,35 +19,29 @@ repositories {
 }
 
 fun generateGitBuild(): String {
-    val stringBuilder: StringBuilder = StringBuilder()
     try {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine("git", "describe", "--always")
-            standardOutput = stdout
-        }
-        val commitObject = stdout.toString().trim()
-        stringBuilder.append(commitObject)
+        val processBuilder = ProcessBuilder("git", "describe", "--always")
+        val output = File.createTempFile("git-build", "")
+        processBuilder.redirectOutput(output)
+        val process = processBuilder.start()
+        process.waitFor()
+        return output.readText().trim()
     } catch (_: Exception) {
-        stringBuilder.append("NoGitSystemAvailable")
+        return "NoGitSystemAvailable"
     }
-    return stringBuilder.toString()
 }
 
 fun generateGitRemote(): String {
-    val stringBuilder: StringBuilder = StringBuilder()
     try {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine("git", "remote", "get-url", "origin")
-            standardOutput = stdout
-        }
-        val commitObject: String = stdout.toString().trim()
-        stringBuilder.append(commitObject)
+        val processBuilder = ProcessBuilder("git", "remote", "get-url", "origin")
+        val output = File.createTempFile("git-remote", "")
+        processBuilder.redirectOutput(output)
+        val process = processBuilder.start()
+        process.waitFor()
+        return output.readText().trim()
     } catch (_: Exception) {
-        stringBuilder.append("NoGitSystemAvailable")
+        return "NoGitSystemAvailable"
     }
-    return stringBuilder.toString()
 }
 
 fun generateDate(): String {
@@ -60,39 +54,31 @@ fun generateDate(): String {
 fun isMaster(): Boolean = !Versions.appVersion.contains("-")
 
 fun gitAvailable(): Boolean {
-    val stringBuilder: StringBuilder = StringBuilder()
     try {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine("git", "--version")
-            standardOutput = stdout
-        }
-        val commitObject = stdout.toString().trim()
-        stringBuilder.append(commitObject)
+        val processBuilder = ProcessBuilder("git", "--version")
+        val output = File.createTempFile("git-version", "")
+        processBuilder.redirectOutput(output)
+        val process = processBuilder.start()
+        process.waitFor()
+        return output.readText().isNotEmpty()
     } catch (_: Exception) {
-        return false // NoGitSystemAvailable
+        return false
     }
-    return stringBuilder.toString().isNotEmpty()
-
 }
 
 fun allCommitted(): Boolean {
-    val stringBuilder: StringBuilder = StringBuilder()
     try {
-        val stdout = ByteArrayOutputStream()
-        exec {
-            commandLine("git", "status", "-s")
-            standardOutput = stdout
-        }
-        // ignore all changes done in .idea/codeStyles
-        val cleanedList: String = stdout.toString().replace(Regex("""(?m)^\s*(M|A|D|\?\?)\s*.*?\.idea\/codeStyles\/.*?\s*$"""), "")
+        val processBuilder = ProcessBuilder("git", "status", "-s")
+        val output = File.createTempFile("git-comited", "")
+        processBuilder.redirectOutput(output)
+        val process = processBuilder.start()
+        process.waitFor()
+        return output.readText().replace(Regex("""(?m)^\s*(M|A|D|\?\?)\s*.*?\.idea\/codeStyles\/.*?\s*$"""), "")
             // ignore all files added to project dir but not staged/known to GIT
-            .replace(Regex("""(?m)^\s*(\?\?)\s*.*?\s*$"""), "")
-        stringBuilder.append(cleanedList.trim())
+            .replace(Regex("""(?m)^\s*(\?\?)\s*.*?\s*$"""), "").trim().isEmpty()
     } catch (_: Exception) {
-        return false // NoGitSystemAvailable
+        return false
     }
-    return stringBuilder.toString().isEmpty()
 }
 
 android {
@@ -205,10 +191,10 @@ dependencies {
     implementation(project(":pump:equil"))
     implementation(project(":pump:insight"))
     implementation(project(":pump:medtronic"))
-    implementation(project(":pump:pump-common"))
-    implementation(project(":pump:omnipod-common"))
-    implementation(project(":pump:omnipod-eros"))
-    implementation(project(":pump:omnipod-dash"))
+    implementation(project(":pump:common"))
+    implementation(project(":pump:omnipod:common"))
+    implementation(project(":pump:omnipod:eros"))
+    implementation(project(":pump:omnipod:dash"))
     implementation(project(":pump:rileylink"))
     implementation(project(":pump:tandem"))
     implementation(project(":pump:virtual"))
@@ -239,7 +225,7 @@ println("isMaster: ${isMaster()}")
 println("gitAvailable: ${gitAvailable()}")
 println("allCommitted: ${allCommitted()}")
 println("-------------------")
-if (isMaster() && !gitAvailable()) {
+if (!gitAvailable()) {
     throw GradleException("GIT system is not available. On Windows try to run Android Studio as an Administrator. Check if GIT is installed and Studio have permissions to use it")
 }
 if (isMaster() && !allCommitted()) {

_docs/icons/expand.svg

@@ -7,7 +7,7 @@ import app.aaps.core.data.model.EB
 import app.aaps.core.data.model.FD
 import app.aaps.core.data.model.GlucoseUnit
 import app.aaps.core.data.model.IDs
-import app.aaps.core.data.model.OE
+import app.aaps.core.data.model.RM
 import app.aaps.core.data.model.TB
 import app.aaps.core.data.model.TE
 import app.aaps.core.data.model.TT
@@ -31,8 +31,8 @@ import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange
 import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged
 import app.aaps.core.interfaces.rx.events.EventNewBG
 import app.aaps.core.interfaces.rx.events.EventNewHistoryData
-import app.aaps.core.interfaces.rx.events.EventOfflineChange
 import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged
+import app.aaps.core.interfaces.rx.events.EventRunningModeChange
 import app.aaps.core.interfaces.rx.events.EventTempBasalChange
 import app.aaps.core.interfaces.rx.events.EventTempTargetChange
 import app.aaps.core.interfaces.rx.events.EventTherapyEventChange
@@ -96,7 +96,7 @@ class CompatDbHelperTest @Inject constructor() {
         rxHelper.listen(EventTempTargetChange::class.java)
         rxHelper.listen(EventTherapyEventChange::class.java)
         rxHelper.listen(EventFoodDatabaseChanged::class.java)
-        rxHelper.listen(EventOfflineChange::class.java)
+        rxHelper.listen(EventRunningModeChange::class.java)
         rxHelper.listen(EventDeviceStatusChange::class.java)
 
         // Enable event logging
@@ -266,16 +266,16 @@ class CompatDbHelperTest @Inject constructor() {
         // EventFoodDatabaseChanged should be triggered
         assertThat(rxHelper.waitFor(EventFoodDatabaseChanged::class.java, comment = "step13").first).isTrue()
 
-        // OE
-        rxHelper.resetState(EventOfflineChange::class.java)
-        val oe = OE(
+        // RM
+        rxHelper.resetState(EventRunningModeChange::class.java)
+        val rm = RM(
             timestamp = dateUtil.now(),
-            reason = OE.Reason.OTHER,
+            mode = RM.Mode.DISCONNECTED_PUMP,
             duration = T.hours(1).msecs()
         )
-        persistenceLayer.insertAndCancelCurrentOfflineEvent(oe, Action.DISCONNECT, Sources.Aaps, null, listOf()).blockingGet()
+        persistenceLayer.insertOrUpdateRunningMode(rm, Action.DISCONNECT, Sources.Aaps, null, listOf()).blockingGet()
         // EventOfflineChange should be triggered
-        assertThat(rxHelper.waitFor(EventOfflineChange::class.java, comment = "step13").first).isTrue()
+        assertThat(rxHelper.waitFor(EventRunningModeChange::class.java, comment = "step13").first).isTrue()
 
         // DS
         rxHelper.resetState(EventDeviceStatusChange::class.java)