AAPS v4

.circleci/config.yml

@@ -17,17 +17,16 @@ jobs:
       - checkout
 
       - run:
-          name: Run compileFullDebugAndroidTestSources
+          name: Compile all test sources
           command: |
             export ANDROID_SDK_ROOT=/usr/lib/android-sdk
             export ANDROID_HOME=/usr/lib/android-sdk
-            env
             ./gradlew \
             -Dorg.gradle.jvmargs="-Xmx8g -XX:+UseParallelGC -Xss1024m" \
-            -Dkotlin.daemon.jvm.options="-Xmx2g" \
-            -Dkotlin.compiler.execution.strategy="in-process" \
+            -Dkotlin.daemon.jvm.options="-Xmx3g" \
             -Dorg.gradle.daemon=true \
-            compileFullDebugAndroidTestSources
+            compileFullDebugAndroidTestSources \
+            compileFullDebugUnitTestSources
 
       - run:
           name: Create avd
@@ -47,35 +46,34 @@ jobs:
           command: |
             export ANDROID_SDK_ROOT=/usr/lib/android-sdk
             export ANDROID_HOME=/usr/lib/android-sdk
-            env
+            export JAVA_TOOL_OPTIONS="-Xmx6g"
             ./gradlew \
-            -Dorg.gradle.jvmargs="-Xmx8g -XX:+UseParallelGC -Xss1024m" \
-            -Dkotlin.daemon.jvm.options="-Xmx2g" \
-            -Dkotlin.compiler.execution.strategy="in-process" \
+            -Dorg.gradle.jvmargs="-Xmx8g -XX:+UseG1GC -XX:MaxMetaspaceSize=1g -Xss1024m" \
+            -Dkotlin.daemon.jvm.options="-Xmx3g" \
+            -Dorg.gradle.workers.max=4 \
             -Dorg.gradle.daemon=true \
             connectedFullDebugAndroidTest
-          
+
       - run:
           name: Kill emulators
           command: |
             echo "Killing emulators"
             adb devices | grep emulator | cut -f1 | while read -r line; do adb -s $line emu kill; done
-          
+
       - run:
           name: Run testFullDebugUnitTest
           command: |
             export ANDROID_SDK_ROOT=/usr/lib/android-sdk
             export ANDROID_HOME=/usr/lib/android-sdk
             ./gradlew \
             -Dorg.gradle.jvmargs="-Xmx8g -XX:+UseParallelGC -Xss1024m" \
-            -Dkotlin.daemon.jvm.options="-Xmx2g" \
-            -Dkotlin.compiler.execution.strategy="in-process" \
+            -Dkotlin.daemon.jvm.options="-Xmx3g" \
             -Dorg.gradle.workers.max=22 \
             -Dorg.gradle.daemon=true \
             testFullDebugUnitTest
 
       - run:
-          run: Run jacocoAllDebugReport
+          name: Run jacocoAllDebugReport
           command: |
             export ANDROID_SDK_ROOT=/usr/lib/android-sdk
             export ANDROID_HOME=/usr/lib/android-sdk

.claude/agent-memory/code-reviewer/MEMORY.md

@@ -0,0 +1,74 @@
+# Code Reviewer Memory
+
+## Key Patterns Confirmed
+
+- `AapsSpacing` object: `extraSmall`(2), `small`(4), `medium`(8), `large`(12), `extraLarge`(16),
+  `xxLarge`(24). Use instead of hardcoded `.dp` literals.
+- `clearFocusOnTap` in `app.aaps.core.ui.compose.Modifiers.kt`. Required for screens with text
+  fields.
+- `ComposablePluginContent` in
+  `core/ui/src/main/kotlin/app/aaps/core/ui/compose/ComposablePluginContent.kt`.
+- `PluginBase.scope` is private; plugins must declare their own `CoroutineScope`.
+- Previews MUST use `MaterialTheme` wrapper (NOT `AapsTheme` — crashes in preview tool).
+
+## DI Patterns by Module
+
+- **Medtrum + Equil**: Use Hilt (`@HiltViewModel`, `hiltViewModel()`). Build needs
+  `libs.plugins.hilt`,
+  `com.google.dagger.hilt.android`, `androidx.hilt.navigation.compose`, ksp hilt compiler.
+  App has `@HiltAndroidApp` on `MainApp`. This is the correct modern pattern.
+- **NSClient, Tidepool, Wear, SMS**: Use Dagger `ViewModelFactory` via
+  `@Binds @IntoMap @ViewModelKey`.
+  `ComposablePluginContent` receives `viewModelFactory` and calls
+  `ViewModelProvider(viewModelStoreOwner, viewModelFactory)[...]`. Instantiating via `remember {}`
+  is a latent lifecycle bug (viewModelScope never cancelled correctly).
+- **ComposeContent constructor**: Always constructed manually in the plugin, receives only
+  non-ViewModel deps (e.g., `protectionCheck`, `blePreCheck`) as constructor params.
+
+## Recurring Bugs Across Pump Compose Migrations
+
+- `BlePreCheckHost` + wizard screen render simultaneously — wizard shows before BLE check completes.
+  Need a separate `isCheckingBle` state to gate wizard rendering. (EOPatch2, Equil) — STILL OPEN in
+  Equil.
+- `SharedFlow` event branches left empty (`// handled inline`) when they are actually NOT handled.
+  (Equil: `ShowMessage` in `EquilComposeContent` swallows unpair errors)
+- Public `val rh: ResourceHelper` on ViewModels — should always be `private val`. (EOPatch2,
+  Equil) — FIXED in Equil.
+- `canGoBack` implemented as a plain Kotlin computed property reading `StateFlow.value` instead of
+  a derived `StateFlow` — not reactive in Compose. (Equil) — FIXED.
+- Step composables accessing ViewModel data via plain function calls instead of `StateFlow`. (
+  Equil) — FIXED.
+- Step count (`totalSteps`) mismatch when shared steps (AIR, CONFIRM) are reused across workflows
+  without updating the workflow's declared `totalSteps`. (Equil: CHANGE_INSULIN declares 4 but
+  runs 6 steps) — FIXED (count correct), but comment in EquilWizardStep.kt line 15 not updated.
+- Duplicate therapy event insertion in activation confirm step — check all `insertTherapyEvent`
+  calls when porting confirm logic. (Equil: double CANNULA_CHANGE event) — RESOLVED, not duplicated.
+- Air removal step: "Finish" button must be disabled until the removal command has been sent and
+  succeeded. Easy to forget when porting from XML (button was initially disabled via alpha). (
+  Equil) — FIXED.
+- Callback.run() in commandQueue executes on background HandlerThread — all MutableStateFlow.value
+  assignments from callbacks are safe (StateFlow is thread-safe), but plain `var` fields (
+  autoFillActive,
+  fillStepCount) accessed from callbacks are NOT safe without @Volatile.
+- Empty password allowed through SerialNumberStep — `isPasswordValid = password.isEmpty() || ...`
+  lets user pair with no password, which is stored and used for future unpair.
+- Resource strings with embedded stray characters: equil_install has trailing `"`,
+  equil_unbind_content
+  has full-width `！`. Always check string values not just keys.
+- `GIF_MAX_HEIGHT = 300.dp` duplicated in 4 step files — WizardGifImage.kt was planned but not
+  created.
+
+## Architecture Notes
+
+- `WizardGifImage.kt` / `WizardImage` in `core/ui/compose/pump/` — shared GIF/image wrapper for
+  wizards. Step composables should use this instead of copy-pasting `GlideImage` boilerplate.
+- `WizardStepLayout`, `StepProgressIndicator`, `WizardButton` in `core/ui/compose/pump/` — shared
+  wizard chrome components.
+- `BlePreCheckHost` in `core/ui/compose/pump/BlePreCheckHost.kt` — async, renders wizard at same
+  time unless guarded.
+
+## See Also
+
+- `equil-migration.md` — detailed Equil Compose migration review (2026-03-09)
+- Earlier migration reviews (NSClient, Tidepool, Wear, SMS, Preferences, EOPatch2): see conversation
+  history from 2026-03-01 and 2026-03-02.

.claude/agent-memory/design-reviewer/MEMORY.md

@@ -0,0 +1,45 @@
+# Design Reviewer Memory
+
+## Key Files
+- Theme spacing: `core/ui/src/main/kotlin/app/aaps/core/ui/compose/AapsSpacing.kt`
+- Shared icon component: `core/ui/src/main/kotlin/app/aaps/core/ui/compose/TonalIcon.kt` (40dp box, 24dp icon)
+- Core composables: `core/ui/src/main/kotlin/app/aaps/core/ui/compose/` (AapsTopAppBar, AapsCard, etc.)
+
+## Sizing Conventions
+- Standard icon in icon button (toolbar/list): 24dp
+- TonalIcon container: 40dp box, 24dp icon inside
+- ConfigPluginItem (expanded plugin rows): 40dp tonal icon container, 24dp icon
+- Category row leading icon: 24dp (no container)
+- Material minimum touch target: 48dp (use `minimumInteractiveComponentSize` or ensure 48dp hit area)
+- IconButton default size: 48dp touch area, but visually can be constrained with `.size()`
+
+## Color Conventions
+- All icon tints use `MaterialTheme.colorScheme.onSurfaceVariant` for secondary/decorative icons
+- Primary/active plugin icons use `MaterialTheme.colorScheme.primary`
+- Do NOT use hardcoded colors; use `MaterialTheme.colorScheme.*` or `AapsTheme.colors.*`
+
+## ConfigurationScreen Patterns (ui module)
+- Category rows: custom Row with clickable modifier, 24dp start padding, 16dp end padding
+- Expanded plugin rows: ListItem with rounded card + secondaryContainer tinted background
+- Chevron: `KeyboardArrowRight` (24dp), animated rotation 0→90° on expand
+- Shortcut icon buttons use `.size(36dp)` constraint on IconButton with 20dp inner icon
+- See: `ui/src/main/kotlin/app/aaps/ui/compose/configuration/ConfigurationScreen.kt`
+
+## Accessibility Patterns
+- Decorative icons that are part of a labeled row: `contentDescription = null` is acceptable
+- Action icons (IconButton) MUST have meaningful contentDescription
+- ConfigurationScreen Settings cog IconButton uses `contentDescription = null` — this is a known bug (line 321)
+- Disabled alpha convention: `0.38f` (matches Material spec) — used inline as a local val, no shared constant in core/ui yet
+
+## ConfigPluginItem Interaction Patterns
+- Card is only clickable when plugin is enabled (line 337: `.then(if (isEnabled) Modifier.clickable {...} else Modifier)`)
+- This creates an interaction gap: disabled plugins have no tap feedback at all — users may tap and think the app froze
+- Switch `onCheckedChange = null` correctly disables it when `canToggle = false` (renders as non-interactive)
+- The Settings cog is hidden when plugin is disabled (correct) — avoids dead-end navigation
+- Trailing Row contains both cog + switch with no spacer between them — they sit very close together (touch target collision risk)
+- `vertical = 2.dp` card margin is tight — cards stack with minimal breathing room
+
+## Patterns Seen
+- QuickLaunchConfigScreen uses `OutlinedIconButton` for add/remove row actions
+- DrawerMenuItem uses full-width clickable rows with icon + label + description
+- ListItem trailing content uses default IconButton (48dp touch target, no size constraint)