Release: 5.1.3-rc0

Bit 5 of pubStatus is always set on A3454 and no longer carries the wear flag (unlike Max gen 1). Read bits 1 and 3 instead — the per-earcup sensors. OR rather than AND so phones that only see one bit reliably still report worn correctly.

Closes #548

.claude/.gitignore

@@ -1 +1,2 @@
-worktrees/
+worktrees/
+scheduled_tasks.lock

.claude/CLAUDE.md

@@ -4,10 +4,7 @@ Android app that detects and monitors AirPods via Bluetooth LE. Displays battery
 
 ## Project Structure
 
-| Module | Description |
-|--------|-------------|
-| `app/` | Main Android app (FOSS and Google Play flavors) |
-| `app-common/` | Shared code between phone and Wear OS apps |
+Single Gradle module `app/` with multiple source sets (`main`, `foss`, `gplay`, `debug`, `test`, `testFoss`, `testGplay`, `screenshotTest`). A previous `app-common/` module was merged into `app/`.
 
 ## Build Flavors
 
@@ -20,10 +17,10 @@ Quick build check: `./gradlew assembleFossDebug`
 
 | Path | Contains |
 |------|----------|
-| `app/src/main/java/` | Main app source (activities, fragments, services) |
-| `app-common/src/main/java/` | Shared logic (monitor, bluetooth, models) |
+| `app/src/main/java/` | Main app source (Compose screens, services, receivers, monitor, bluetooth, models) |
+| `app/src/foss/java/`, `app/src/gplay/java/` | Flavor-specific code (e.g. upgrade/billing) |
 | `app/src/main/res/` | Layouts, drawables, strings |
-| `app-common/src/test/` | Unit tests |
+| `app/src/test/`, `app/src/testFoss/`, `app/src/testGplay/` | Unit tests (shared + flavor-specific) |
 | `app/build.gradle.kts` | App build config, dependencies, flavors |
 | `app/src/debug/java/.../screenshots/` | Play Store screenshot content composables |
 | `fastlane/` | Screenshot generation scripts, Play Store metadata |
@@ -31,7 +28,6 @@ Quick build check: `./gradlew assembleFossDebug`
 ## Development Tips
 
 - Use `assembleFossDebug` as the fastest build variant for iteration
-- Shared code goes in `app-common/`, app-specific code in `app/`
 - Follow existing patterns — the codebase uses MVVM + Hilt + Coroutines
 - Always use string resources for user-facing text (see localization rules)
 - Check `git log --oneline -20` for commit message style before committing
@@ -47,3 +43,4 @@ Detailed guidelines are in `.claude/rules/`:
 - `pull-requests.md` — PR title and description conventions
 - `agent-instructions.md` — Sub-agent delegation and critical thinking
 - `screenshots.md` — Play Store screenshot pipeline, commands, adding new screens
+- `release.md` — Release workflow (`Release prepare` dispatch), inputs, channel mapping, rollback

.claude/rules/architecture.md

@@ -2,16 +2,22 @@
 description: Architecture overview, module structure, key components, data flow, and dependencies
 globs:
   - "app/**/*.kt"
-  - "app-common/**/*.kt"
   - "**/*.gradle.kts"
 ---
 
 # Architecture
 
-## Multi-Module Structure
+## Single-Module Structure
 
-- **app/**: Main Android application with FOSS and Google Play flavors
-- **app-common/**: Shared code between main app and Wear OS app
+One Gradle module: `app/`. Source sets:
+
+- `main` — shared code (Compose UI, services, monitor, bluetooth, AAP protocol, widgets)
+- `foss` / `gplay` — flavor-specific code (e.g. upgrade/billing implementations)
+- `debug` — debug-only code including screenshot content composables
+- `test` / `testFoss` / `testGplay` — unit tests
+- `screenshotTest` — Compose Preview Screenshot tests for Play Store assets
+
+A previous `app-common/` module was merged into `app/` (commit `be8f4919`).
 
 ## Core Patterns
 
@@ -22,18 +28,62 @@ globs:
 
 ## Key Components
 
-### PodMonitor System
+### Device Monitoring
 
-- `PodMonitor`: Core service that detects and tracks AirPods via Bluetooth LE
-- `MonitorControl`: Manages MonitorService lifecycle
-- `MonitorService`: Foreground service that continuously scans for AirPods
-- `BluetoothEventReceiver`: Handles system Bluetooth events
+`monitor/core/` is split into two data-source siblings that `DeviceMonitor` merges:
+
+- `monitor/core/ble/BlePodMonitor` — passive BLE scanning; reads Apple advertisement beacons (battery, case state, in-ear, etc.). Works for any pod in range; no pairing required
+- `monitor/core/aap/` — AAP connection lifecycle layer on top of `AapConnectionManager`:
+  - `AapLifecycleManager` — starts/stops the AAP subsystem
+  - `AapAutoConnect` — auto-opens AAP sessions for bonded/known devices
+  - `AapKeyPersister`, `AapLearnedSettingsPersister` — persist session keys and learned pod settings across app restarts
+  - `StemConfigSender`, `StemPressReaction`, `AncGestureResolver` — push config and react to stem/HID events
+- `monitor/core/cache/DeviceStateCache` — persisted last-known state so profiles still show data when a device is out of range
+- `DeviceMonitor` — singleton that `combine`s `BlePodMonitor.devices + AapConnectionManager.allStates + DeviceStateCache + profiles` into unified `PodDevice` objects. ViewModels observe `DeviceMonitor.devices`; they do **not** reach into `BlePodMonitor` or the AAP layer directly
+- `MonitorControl` / `MonitorService` — foreground service lifecycle holding the scan awake
+- `BluetoothEventReceiver`, `BootCompletedReceiver` — system triggers that wake the service
+
+**BLE vs AAP — what each path gives you:**
+
+| | BLE (advertisements) | AAP (L2CAP session) |
+|---|---|---|
+| Direction | Read-only, passive | Bidirectional commands + events |
+| Prerequisite | Bluetooth on | Bonded + `BLUETOOTH_CONNECT` + active L2CAP socket |
+| Data | Battery, case open, in-ear, pod model | Settings, ANC mode control, press controls, stem events, device info |
+| Availability | Any pod in range | Only your own paired pods |
 
 ### Reaction System
 
-- `ReactionSettingsFragment`: Configuration for popup notifications
+- `ReactionsCard`: Compose UI for reaction settings, embedded in the device settings screen
 - `PopUpWindow`: Displays AirPods status when case is opened
-- `PopUpPodViewFactory`: Creates UI components for different pod models
+- `PopUpContent`: Compose pod rendering — model-specific UI branches inline, no factory class
+
+### Widget System (Glance)
+
+- `BatteryGlanceWidget`, `AncGlanceWidget`: Jetpack Glance-based home-screen widgets
+- `WidgetConfigurationActivity`: Configuration UI launched on widget placement
+- Lives under `app/src/main/java/eu/darken/capod/main/ui/widget/`
+
+### Upgrade / Pro Features
+
+- `UpgradeRepo` interface with two flavor implementations:
+  - `UpgradeRepoGplay` — billing-client backed, includes grace-period handling for interrupted purchases
+  - `UpgradeControlFoss` — cache/sponsor-backed; users are `isPro = false` until they call `upgrade()`, after which the pro flag is persisted via DataStore
+- FOSS is **not** "always pro" — it's opt-in via a local sponsor flow
+
+### AAP (Apple Accessory Protocol) Stack
+
+Three-layer structure under `pods/core/apple/aap/`:
+
+- **`protocol/`** — pure data: `AapMessage`, `AapCommand`, `AapSetting`, `AapDeviceProfile`, `AapDeviceInfo`, `StemPressEvent`, `KeyExchangeResult`. Plus `DefaultAapDeviceProfile` and `Model.Features` capturing per-model capability
+- **`engine/`** — session state machine for one connection:
+  - `AapConnection` — the L2CAP socket wrapper
+  - `AapSessionEngine` — drives the session lifecycle; tested in `AapSessionEngineTest`
+  - `AapInboundInterpreter` / `AapOutboundController` — decode incoming messages, encode outgoing
+  - `AapSettingsCoordinator`, `AapAncController`, `HidTracker`, `AapDeviceInfoDiagnostics` — feature-specific coordinators that sit on top of the session
+- **`AapConnectionManager`** (singleton) — owns all open AAP sessions keyed by `BluetoothAddress`, uses `L2capSocketFactory` to create sockets. Consumers don't touch `AapConnection` directly — they call `sendCommand(...)` and observe `allStates`
+
+The monitor-layer glue (`monitor/core/aap/`) described above wires this stack into the foreground service and persists its learned state.
 
 ### Common Utilities
 
@@ -54,31 +104,20 @@ globs:
 
 ## Data Flow
 
-The app follows a unidirectional data flow:
-
-1. `BluetoothEventReceiver` detects Bluetooth events
-2. `MonitorService` scans for AirPods beacon data
-3. `PodMonitor` processes and stores device information
-4. ViewModels observe monitor data via repositories
-5. UI components react to ViewModel state changes
-6. `ReactionSystem` triggers popups and notifications
-
-## Bluetooth LE Implementation
-
-The app uses Android's Bluetooth LE APIs to scan for Apple device advertisements. The core scanning logic is in `MonitorService` which runs as a foreground service.
-
-## Multi-Platform Considerations
-
-Code shared between phone and Wear OS apps is placed in `app-common`. When modifying shared functionality, ensure compatibility across both platforms.
+1. `BluetoothEventReceiver` / `BootCompletedReceiver` wake `MonitorService` (foreground)
+2. `MonitorService` keeps `BlePodMonitor` scanning (passive advertisements) and `AapLifecycleManager` running (active L2CAP sessions via `AapConnectionManager`)
+3. `DeviceMonitor` merges BLE + AAP + cached state + profiles into `PodDevice` objects
+4. ViewModels (`OverviewViewModel`, `DeviceSettingsViewModel`, `PressControlsViewModel`, widget view models) observe `DeviceMonitor.devices`; settings/command changes are sent back through `AapConnectionManager.sendCommand(...)`
+5. Reaction triggers (case-open popup, auto-play, notifications) and widget state updates react to the merged flow
 
 ## Testing Strategy
 
-- **Unit Tests**: Located in `app-common/src/test/` for shared logic
-- **Test Flavors**: Separate test configurations for FOSS and Google Play variants
+- **Unit Tests**: `app/src/test/` (shared), `app/src/testFoss/`, `app/src/testGplay/` (flavor-specific — e.g. `UpgradeRepoGplayTest`, `FossUpgradeSerializationTest`)
+- **Screenshot Tests**: `app/src/screenshotTest/` — Compose Preview Screenshot Testing, powers the Play Store screenshot pipeline
 
 ## Key Dependencies
 
 - **Hilt**: Dependency injection framework
-- **AndroidX Navigation**: Fragment navigation with SafeArgs
+- **Navigation**: Navigation3 (`addNavigation3()`) drives current Compose screen routing. Some legacy `androidx.navigation` helpers still exist (`NavDirectionsExtensions`, `ViewModel3`) — don't assume SafeArgs is fully gone
 - **kotlinx.serialization**: JSON serialization for configuration and caching
-- **Material Design**: UI components following Material Design guidelines
+- **Material Design 3**: Compose Material3 UI components

.claude/rules/commit-guidelines.md

@@ -21,6 +21,7 @@ Use the existing commit history as reference. Common prefixes:
 - **fix**: Bug fixes (e.g., `fix: Handle display cutouts in landscape mode`)
 - **feat**: New features
 - **refactor**: Code restructuring without behavior change
+- **ui**: Visual/layout-only tweaks that aren't a full feature or refactor (e.g., `ui(overview): ...`)
 - **chore**: Maintenance, dependency updates, build config
 - **docs**: Documentation changes
 

.claude/rules/localization.md

@@ -9,7 +9,7 @@ globs:
 When adding new user-facing strings:
 
 - **Always use string resources**: Never hardcode user-facing text in layouts or code
-- **Follow naming conventions**: Use descriptive, hierarchical naming (e.g., `profiles_name_default`, `settings_bluetooth_enabled`)
+- **Follow naming conventions**: Use descriptive, hierarchical naming (e.g., `profiles_name_default`, `settings_monitor_mode_label`)
 - **Provide context**: String names should indicate usage and location
 - **Consider pluralization**: Use Android plural resources (`<plurals>`) when quantities vary
 
@@ -17,5 +17,7 @@ When adding new user-facing strings:
 
 - `profiles_create_title` (screen title)
 - `profiles_name_label` (form field label)
-- `profiles_delete_confirmation` (dialog message)
-- `error_network_unavailable` (error message)
+- `profiles_name_default` (default value)
+- `troubleshooter_ble_result_failure_title` (status/error title)
+
+Common prefixes currently in use: `device_`, `settings_`, `support_`, `profiles_`, `press_`, `general_`, `pods_`, `upgrade_`, `widget_`, `debug_`, `permission_`, `troubleshooter_`, `overview_`, `anc_`, `onboarding_`. There is no `error_*` prefix — error labels live under the relevant feature (e.g. `general_error_label`, `troubleshooter_*_failure_*`).

.claude/rules/pull-requests.md

@@ -40,6 +40,18 @@ PR titles appear in auto-generated changelogs and are read by users. Use **ELI5,
 
 ## PR Description Format
 
+PRs are reviewed in **GitHub's web UI**, which already shows the file tree, the diff, and the tests. Don't duplicate any
+of it. The description should answer questions the diff can't — not restate it.
+
+Only these sections, in this order:
+
+1. `## What changed`
+2. `## Technical Context`
+3. `## Review checklist` *(optional)*
+
+No `Scope`, `Files changed`, `Tests`, or `Review guidance` sub-sections — GitHub shows the files and tests, and review
+notes belong in the checklist. Fold anything critical into a Technical Context bullet.
+
 ### What changed
 
 User-friendly explanation of what this PR does. Describe the problem that was fixed or the feature that was added from the user's perspective. No internal class or method names.
@@ -53,9 +65,18 @@ Explain what's hard to extract from the diff alone. Focus on:
 - **Why** this approach was chosen (and alternatives considered/rejected)
 - **Root cause** for bug fixes (the diff shows the fix, not what caused it)
 - **Non-obvious side effects** or behavioral changes not apparent from reading the code
-- **Review guidance** — what's tricky or deserves close attention
 
-Keep it scannable with bullet points. Don't restate what's visible in the diff (file names, class renames, line-level changes).
+Format rules:
+
+- **One bullet per point.** No prose paragraphs, no nested sub-headers like `**Bug 1** / **Bug 2**` — if a PR fixes
+  multiple bugs, one bullet per bug is enough.
+- **Don't restate the diff.** File paths, class renames, test names, and line-level changes are all visible in the web
+  UI.
+
+### Review checklist (optional)
+
+For PRs with multiple non-trivial review points, add a `## Review checklist` section with `- [ ]` tasks the reviewer can
+tick off as they verify. Skip it for small PRs — a single tricky thing can stay as a Technical Context bullet.
 
 ### Example
 

.claude/rules/release.md

@@ -0,0 +1,78 @@
+# Release Process
+
+Releases are cut via the **Release prepare** workflow (`.github/workflows/release-prepare.yml`). It bumps `version.properties` and `VERSION`, commits to `main`, tags `v<version>`, pushes atomically, and dispatches `release-tag.yml` which builds, signs, and uploads.
+
+## Dispatch
+
+```bash
+# Plan only — no commit, no tag, no push.
+gh workflow run release-prepare.yml -f bump_kind=build -f dry_run=true
+
+# Real cut.
+gh workflow run release-prepare.yml -f bump_kind=build -f dry_run=false
+```
+
+After `dry_run=false`: Job 1 computes + writes the summary, then Job 2 immediately commits/tags/pushes (no env gate — cancel the run between Job 1 and Job 2 if the summary looks wrong; you have ~seconds). The tag push naturally triggers `release-tag.yml` (the App-token push fires `on: push:` workflows; only `GITHUB_TOKEN`-pushes are suppressed). `release-tag.yml` then runs `validate-tag` and the existing `release-github` (`foss-production` approval) + `release-gplay` (`gplay-production` approval) jobs — those are the two human checkpoints, matching the pre-migration UX.
+
+## Inputs
+
+| Input | Default | Notes |
+|---|---|---|
+| `bump_kind` | `build` | `build` \| `patch` \| `minor` \| `major` |
+| `version_type` | `keep-current` | Preserves current `rc`/`beta`. Set explicitly to switch. |
+| `version_override` | empty | e.g. `5.1.2-rc0`. Bypasses bump_kind/version_type. |
+| `expected_current` | empty | Optional: fail if `version.properties` ≠ this. Useful for tight coordination. |
+| `dry_run` | `true` | Default is plan-only. |
+
+Bump rules: `build` increments build; `patch`/`minor`/`major` zero everything to the right of the bumped field. All numeric fields bounded `0..99` (the `versionCode` formula collapses at ≥100).
+
+## Local
+
+```bash
+./tools/release/bump.sh --mode=plan --bump-kind=build --version-type=keep-current
+./tools/release/bump.sh --mode=check
+bats tools/release/bump.bats
+```
+
+## Channel mapping
+
+| Tag suffix | FOSS APK | GitHub release | Fastlane lane | Play track | Rollout |
+|---|---|---|---|---|---|
+| `-beta*` | `assembleFossBeta` | pre-release | `beta` | `beta` | 10% |
+| `-rc*` (or anything else) | `assembleFossRelease` | full release | `production` | **`beta`** | 10% |
+
+`lane :production` in `Fastfile` uploads to Play's **beta** track at 10% — manually promoted to production via Play Console.
+
+## Rollback
+
+| Stage reached | Steps |
+|---|---|
+| Bump on `main`, downstream not started | `git push origin :refs/tags/v<bad>`, `git revert <bump-sha>`, push |
+| GitHub release created | Above + `gh release delete v<bad> --yes --cleanup-tag` |
+| Play upload completed | Above + halt rollout in Play Console (or `bundle exec fastlane supply --track beta --rollout 0 --version-code <bad-code>`) |
+| Job 2 ran but downstream rejected at env approval | Treat as first row — bump+tag are public on `main` regardless of downstream outcome |
+
+`bump.sh` enforces strict `versionCode` monotonicity, so re-using a code is impossible without manually editing `version.properties`.
+
+## Auth setup
+
+`release-prepare.yml` Job 2 uses a GitHub App token (not `GITHUB_TOKEN`) to push the bump commit and tag. The App identity is in the rulesets' bypass list, which is what allows the push to bypass branch protection + tag-creation restrictions.
+
+Required org secrets (set on the d4rken-org organization, accessible to `capod`):
+
+- `RELEASE_APP_CLIENT_ID` — Client ID of the `d4rken-org-releaser` GitHub App (visible on the App's settings page, format `Iv1.<hex>` or similar)
+- `RELEASE_APP_PRIVATE_KEY` — full `.pem` contents (including BEGIN/END lines)
+
+The App is installed on this repo and added as a bypass actor to:
+- The main-branch ruleset (PR + status check requirements)
+- The tag ruleset (creation restriction on `v*`)
+
+Other apps in the org can reuse the same App + secrets — just install the App on each repo and add it to that repo's rulesets' bypass lists.
+
+## Defense in depth
+
+`release-tag.yml` includes `validate-tag` which: (1) regex-checks `github.ref_name`, (2) runs `bump.sh --mode=check`, (3) asserts the parsed name matches the tag. Manual `gh workflow run release-tag.yml --ref vfoo` or hand-pushed tags fail before any build.
+
+## Stuck-dispatch recovery
+
+If Job 2's atomic push lands but the natural `on: push:` trigger doesn't fire `release-tag.yml` (rare — would mean GitHub dropped the event), the tag is public but no pipeline runs. Re-dispatch manually: `gh workflow run release-tag.yml --ref v<new> -f dry_run=false`.

.claude/rules/screenshots.md

@@ -19,16 +19,17 @@ ScreenshotContent.kt (mock data + composables)
 
 | File | Purpose |
 |------|---------|
-| `app/src/debug/java/.../screenshots/ScreenshotContent.kt` | Mock data composables for each screen (8 screens) |
-| `app/src/screenshotTest/kotlin/.../screenshots/PlayStoreScreenshots.kt` | `@PreviewTest` functions that wire content to locale annotations |
+| `app/src/debug/java/.../screenshots/ScreenshotContent.kt` | Mock data composables for each screen (7 screens) |
+| `app/src/screenshotTest/kotlin/.../screenshots/PlayStoreScreenshots.kt` | `@PreviewTest` functions (currently: `DashboardLight`, `DashboardDark`, `CasePopUp`, `DeviceProfiles`, `AddProfile`, `DeviceSettingsReactions`, `WidgetConfiguration`) |
 | `app/src/screenshotTest/kotlin/.../screenshots/PlayStoreLocales.kt` | Multi-preview annotations (auto-generated by batch script) |
-| `fastlane/generate_screenshots.sh` | Batched generation across 68 locales |
+| `fastlane/generate_screenshots.sh` | Batched generation; locale list (`ALL_LOCALES`) and `BATCH_SIZE` are defined inside the script |
 | `fastlane/copy_screenshots.sh` | Copies rendered PNGs into fastlane structure |
 
 ## Commands
 
 ```bash
-# Full run — all 68 locales, ~12 batches, ~7 minutes
+# Full run — iterates over ALL_LOCALES in batches of BATCH_SIZE.
+# The script prints "Locales: N | Batch size: B | Batches: ceil(N/B)" at startup.
 ./fastlane/generate_screenshots.sh
 
 # Smoke test — 6 locales (en, de, ja, ar, zh-CN, pt-BR), single batch
@@ -37,7 +38,7 @@ ScreenshotContent.kt (mock data + composables)
 # Copy into fastlane directories (run after generate)
 ./fastlane/copy_screenshots.sh
 
-# Clean copy (removes old screenshots first)
+# Clean copy (removes old screenshots first) — REQUIRED when screens are removed or renamed
 ./fastlane/copy_screenshots.sh --clean
 ```
 
@@ -49,6 +50,12 @@ ScreenshotContent.kt (mock data + composables)
 4. Update the expected count in `generate_screenshots.sh` (composables per locale)
 5. Run the full pipeline: `generate_screenshots.sh` then `copy_screenshots.sh`
 
+## Removing or Renaming a Screenshot
+
+1. Remove the `@PreviewTest` entry and its `SCREEN_MAP` mapping
+2. Run `generate_screenshots.sh`
+3. Run `copy_screenshots.sh --clean` — **`--clean` is required** here; without it, old files (e.g. a renamed `8_reaction_settings.png`) stay in `fastlane/metadata/android/*/images/phoneScreenshots/` and get uploaded to Play Store
+
 ## After UI Changes
 
 When modifying a screen that appears in screenshots (check `ScreenshotContent.kt`), regenerate:
@@ -60,7 +67,7 @@ When modifying a screen that appears in screenshots (check `ScreenshotContent.kt
 
 ## Technical Notes
 
-- Batch size defaults to 2 locales (16 renders) to avoid layoutlib memory leak (~10MB/image)
+- Batch size defaults to 2 locales; renders per batch = `BATCH_SIZE × screen count` (currently 2 × 7 = 14). Small batches avoid layoutlib memory leaks (~10MB/image)
 - Gradle daemon is stopped between batches to release memory
 - `PlayStoreLocales.kt` is temporarily rewritten per batch and restored via trap
 - Device spec: 1080x2400px @ 428 DPI (Pixel-class phone)

.claude/settings.json

@@ -1,16 +1,17 @@
 {
   "permissions": {
-	"allow": [
-	  "mcp__ide__getDiagnostics",
-	  "WebSearch"
-	],
-	"deny": []
+    "allow": [
+      "mcp__ide__getDiagnostics",
+      "WebSearch"
+    ],
+    "deny": []
   },
   "enabledPlugins": {
-	"android-translation@claude-code-cafe": true,
-	"debugbadger@claude-code-cafe": true,
-	"jvm-tools@claude-code-cafe": true,
-	"frontend-design@claude-plugins-official": true,
-	"kotlin-lsp@claude-plugins-official": true
+    "android-translation@claude-code-cafe": true,
+    "debugbadger@claude-code-cafe": true,
+    "jvm-tools@claude-code-cafe": true,
+    "frontend-design@claude-plugins-official": true,
+    "kotlin-lsp@claude-plugins-official": true,
+    "support-investigator@claude-code-cafe": true
   }
-}
+}

.github/actions/common-setup/action.yml

@@ -30,13 +30,4 @@ runs:
           ~/.gradle/caches
         key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'buildSrc/**/*.kt') }}
         restore-keys: |
-          ${{ runner.os }}-gradle-caches-
-
-    - name: Cache Android Global Build-Cache
-      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 #v5.0.3
-      with:
-        path: |
-          ~/.android/build-cache
-        key: ${{ runner.os }}-android-build-cache-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-android-build-cache-
+          ${{ runner.os }}-gradle-caches-

.github/workflows/code-checks.yml

@@ -3,9 +3,15 @@ name: Code tests & eval
 on:
   push:
     branches: [ main ]
+    paths-ignore:
+      - VERSION
+      - version.properties
   pull_request:
     branches: [ main ]
 
+permissions:
+  contents: read
+
 jobs:
   lint-vital:
     name: Lint vitals
@@ -19,6 +25,8 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
       - name: Setup project and build environment
         uses: ./.github/actions/common-setup
 
@@ -37,6 +45,8 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
       - name: Setup project and build environment
         uses: ./.github/actions/common-setup
 
@@ -54,6 +64,8 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
       - name: Setup project and build environment
         uses: ./.github/actions/common-setup
 
@@ -66,5 +78,30 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
       - name: Validate metadata lengths
-        run: bash fastlane/check_metadata_length.sh
+        run: bash fastlane/check_metadata_length.sh
+
+  check-release-tooling:
+    name: Release tooling
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Install bats and shellcheck
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bats shellcheck
+
+      - name: Shellcheck bump.sh
+        run: shellcheck tools/release/bump.sh
+
+      - name: Run bump.sh unit tests
+        run: bats tools/release/bump.bats
+
+      - name: Verify version.properties + VERSION are consistent
+        run: ./tools/release/bump.sh --mode=check

.github/workflows/gradle-wrapper-validation.yml

@@ -4,14 +4,22 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - VERSION
+      - version.properties
   pull_request:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   validation:
     name: "Validation"
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
       - uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c #v5.0.2

.github/workflows/pages.yml

@@ -0,0 +1,66 @@
+name: Deploy GitHub Pages
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - _config.yml
+      - _layouts/**
+      - README.md
+      - CHANGELOG.md
+      - PRIVACY_POLICY.md
+      - CNAME
+      - .github/workflows/pages.yml
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    name: Build Jekyll site
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Configure Pages
+        uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d #v6.0.0
+
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@44a6e6beabd48582f863aeeb6cb2151cc1716697 #v1.0.13
+        with:
+          source: ./
+          destination: ./_site
+        env:
+          JEKYLL_GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Sanity-check Jekyll output
+        run: test -f _site/index.html && test -f _site/CNAME
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 #v5.0.0
+        with:
+          path: ./_site
+
+  deploy:
+    name: Deploy to GitHub Pages
+    needs: build
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-22.04
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 #v5.0.0

.github/workflows/release-prepare.yml

@@ -0,0 +1,235 @@
+name: Release prepare
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump_kind:
+        description: 'How to bump the version (ignored if version_override is set)'
+        type: choice
+        options: [build, patch, minor, major]
+        default: build
+      version_type:
+        description: 'Channel for the new version (keep-current preserves current type)'
+        type: choice
+        options: [keep-current, rc, beta]
+        default: keep-current
+      version_override:
+        description: 'Explicit version, e.g. 5.1.2-rc0 (overrides bump_kind/version_type)'
+        type: string
+        default: ''
+      expected_current:
+        description: 'Optional safety check: fail if current version.properties does not match (e.g. 5.1.1-rc0)'
+        type: string
+        default: ''
+      dry_run:
+        description: 'When true: compute and validate only. When false: commit, tag, push, dispatch release-tag.yml.'
+        type: boolean
+        default: true
+
+permissions:
+  contents: read
+
+concurrency:
+  group: release-prepare-main
+  cancel-in-progress: false
+
+jobs:
+  compute-and-validate:
+    name: Compute and validate
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    outputs:
+      new_name: ${{ steps.plan.outputs.new_name }}
+      new_code: ${{ steps.plan.outputs.new_code }}
+      current_name: ${{ steps.plan.outputs.current_name }}
+    env:
+      INPUT_BUMP_KIND: ${{ inputs.bump_kind }}
+      INPUT_VERSION_TYPE: ${{ inputs.version_type }}
+      INPUT_VERSION_OVERRIDE: ${{ inputs.version_override }}
+      INPUT_EXPECTED_CURRENT: ${{ inputs.expected_current }}
+    steps:
+      - name: Guard ref must be main
+        run: |
+          if [[ "${GITHUB_REF}" != "refs/heads/main" ]]; then
+            echo "Must dispatch from main, got ${GITHUB_REF}" >&2
+            exit 1
+          fi
+
+      - name: Checkout main
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          ref: main
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Compute and validate
+        id: plan
+        run: |
+          set -euo pipefail
+          args=("--mode=plan")
+          if [[ -n "${INPUT_VERSION_OVERRIDE}" ]]; then
+            args+=("--version-override=${INPUT_VERSION_OVERRIDE}")
+          else
+            args+=("--bump-kind=${INPUT_BUMP_KIND}")
+            args+=("--version-type=${INPUT_VERSION_TYPE}")
+          fi
+          if [[ -n "${INPUT_EXPECTED_CURRENT}" ]]; then
+            args+=("--expected-current=${INPUT_EXPECTED_CURRENT}")
+          fi
+          ./tools/release/bump.sh "${args[@]}" | tee plan.txt
+          {
+            grep -E '^current_name=' plan.txt
+            grep -E '^new_name=' plan.txt
+            grep -E '^new_code=' plan.txt
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Tag collision check (local + remote)
+        env:
+          NEW_NAME: ${{ steps.plan.outputs.new_name }}
+        run: |
+          set -euo pipefail
+          if git rev-parse --verify "refs/tags/v${NEW_NAME}" >/dev/null 2>&1; then
+            echo "Local tag v${NEW_NAME} already exists" >&2
+            exit 1
+          fi
+          if git ls-remote --exit-code --tags origin "refs/tags/v${NEW_NAME}" >/dev/null; then
+            echo "Remote tag v${NEW_NAME} already exists" >&2
+            exit 1
+          fi
+
+      - name: Write step summary
+        env:
+          CURRENT_NAME: ${{ steps.plan.outputs.current_name }}
+          NEW_NAME: ${{ steps.plan.outputs.new_name }}
+          NEW_CODE: ${{ steps.plan.outputs.new_code }}
+          DRY_RUN: ${{ inputs.dry_run }}
+        run: |
+          set -euo pipefail
+          {
+            echo "## Release plan"
+            echo
+            echo "| | |"
+            echo "|---|---|"
+            echo "| Current | \`${CURRENT_NAME}\` |"
+            echo "| New | \`${NEW_NAME}\` (code ${NEW_CODE}) |"
+            echo "| Tag | \`v${NEW_NAME}\` |"
+            echo "| Dry run | \`${DRY_RUN}\` |"
+            echo
+            echo "### bump.sh output"
+            echo
+            echo '```'
+            cat plan.txt
+            echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
+
+  push-and-dispatch:
+    name: Push and dispatch
+    needs: compute-and-validate
+    if: ${{ !inputs.dry_run }}
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    env:
+      INPUT_BUMP_KIND: ${{ inputs.bump_kind }}
+      INPUT_VERSION_TYPE: ${{ inputs.version_type }}
+      INPUT_VERSION_OVERRIDE: ${{ inputs.version_override }}
+      NEW_NAME: ${{ needs.compute-and-validate.outputs.new_name }}
+      NEW_CODE: ${{ needs.compute-and-validate.outputs.new_code }}
+      CURRENT_NAME_AT_PLAN: ${{ needs.compute-and-validate.outputs.current_name }}
+    steps:
+      - name: Mint App token
+        id: app-token
+        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 #v3.1.1
+        with:
+          client-id: ${{ secrets.RELEASE_APP_CLIENT_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+
+      - name: Resolve bot identity
+        id: bot
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
+        run: |
+          set -euo pipefail
+          user_id=$(gh api "/users/${APP_SLUG}%5Bbot%5D" --jq .id)
+          echo "user_name=${APP_SLUG}[bot]" >> "$GITHUB_OUTPUT"
+          echo "user_email=${user_id}+${APP_SLUG}[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout main with credentials
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          ref: main
+          fetch-depth: 0
+          persist-credentials: true
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Verify state still matches plan from Job 1
+        run: |
+          set -euo pipefail
+          ./tools/release/bump.sh --mode=check --expected-current="${CURRENT_NAME_AT_PLAN}"
+
+      - name: Re-check tag collision (state may have moved between jobs)
+        run: |
+          set -euo pipefail
+          if git rev-parse --verify "refs/tags/v${NEW_NAME}" >/dev/null 2>&1; then
+            echo "Local tag v${NEW_NAME} already exists" >&2
+            exit 1
+          fi
+          if git ls-remote --exit-code --tags origin "refs/tags/v${NEW_NAME}" >/dev/null; then
+            echo "Remote tag v${NEW_NAME} already exists" >&2
+            exit 1
+          fi
+
+      - name: Apply bump
+        run: |
+          set -euo pipefail
+          args=("--mode=write" "--expected-current=${CURRENT_NAME_AT_PLAN}")
+          if [[ -n "${INPUT_VERSION_OVERRIDE}" ]]; then
+            args+=("--version-override=${INPUT_VERSION_OVERRIDE}")
+          else
+            args+=("--bump-kind=${INPUT_BUMP_KIND}")
+            args+=("--version-type=${INPUT_VERSION_TYPE}")
+          fi
+          ./tools/release/bump.sh "${args[@]}"
+
+      - name: Verify post-write state matches plan
+        run: |
+          set -euo pipefail
+          ./tools/release/bump.sh --mode=check --expected-current="${NEW_NAME}"
+
+      - name: Configure git identity
+        env:
+          BOT_USER_NAME: ${{ steps.bot.outputs.user_name }}
+          BOT_USER_EMAIL: ${{ steps.bot.outputs.user_email }}
+        run: |
+          git config user.name "${BOT_USER_NAME}"
+          git config user.email "${BOT_USER_EMAIL}"
+
+      - name: Commit and tag
+        run: |
+          set -euo pipefail
+          git add version.properties VERSION
+          git commit -m "Release: ${NEW_NAME}"
+          git tag -a "v${NEW_NAME}" -m "Release v${NEW_NAME}"
+
+      - name: Atomic push (commit + tag)
+        run: |
+          set -euo pipefail
+          git push --atomic origin "HEAD:refs/heads/main" "refs/tags/v${NEW_NAME}"
+
+      - name: Write step summary
+        run: |
+          set -euo pipefail
+          {
+            echo "## Released"
+            echo
+            echo "| | |"
+            echo "|---|---|"
+            echo "| Tag | \`v${NEW_NAME}\` |"
+            echo "| Version code | \`${NEW_CODE}\` |"
+            echo "| Bump commit | on \`main\` |"
+            echo "| Downstream | dispatched \`release-tag.yml\` |"
+            echo
+            echo "Watch the [Tagged releases](../../actions/workflows/release-tag.yml) workflow for the build + upload."
+          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/release-tag.yml

@@ -11,11 +11,57 @@ on:
         type: boolean
         default: true
 
+permissions:
+  contents: read
+
+concurrency:
+  group: release-${{ github.ref_name }}
+  cancel-in-progress: false
+
 jobs:
+  validate-tag:
+    name: Validate tag
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check tag-name format
+        env:
+          REF_NAME: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+          if [[ ! "${REF_NAME}" =~ ^v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}-(rc|beta)[0-9]{1,2}$ ]]; then
+            echo "Tag '${REF_NAME}' does not match v<M.m.p-(rc|beta)n>" >&2
+            echo "Releases must be cut via the 'Release prepare' workflow." >&2
+            exit 1
+          fi
+
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+        with:
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Verify version.properties matches tag
+        env:
+          REF_NAME: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+          # Strip leading 'v' to get the bare version name.
+          tag_name="${REF_NAME#v}"
+          # bump.sh in check mode emits current_name=...
+          parsed=$(./tools/release/bump.sh --mode=check)
+          current_name=$(echo "$parsed" | grep -E '^current_name=' | cut -d= -f2)
+          if [[ "$current_name" != "$tag_name" ]]; then
+            echo "Tag '${REF_NAME}' does not match version.properties name '$current_name'" >&2
+            echo "version.properties + VERSION must equal the tag — releases must be cut via 'Release prepare'." >&2
+            exit 1
+          fi
+
   release-github:
+    needs: validate-tag
     name: Create GitHub release
     permissions:
       contents: write
+      actions: write
     runs-on: ubuntu-22.04
     environment: foss-production
     steps:
@@ -33,6 +79,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup project and build environment
         uses: ./.github/actions/common-setup
@@ -57,7 +104,7 @@ jobs:
 
       - name: Create pre-release
         if: contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b #v2.5.0
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda #v3.0.0
         with:
           prerelease: true
           tag_name: ${{ github.ref_name }}
@@ -69,7 +116,7 @@ jobs:
 
       - name: Create release
         if: "!contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)"
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b #v2.5.0
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda #v3.0.0
         with:
           prerelease: false
           tag_name: ${{ github.ref_name }}
@@ -79,10 +126,19 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Trigger GitHub Pages deployment
+        if: "!(github.event_name == 'workflow_dispatch' && inputs.dry_run)"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh workflow run pages.yml --ref main
+
   release-gplay:
+    needs: validate-tag
     name: Create Google Play release
     runs-on: ubuntu-22.04
     environment: gplay-production
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/fastlane/Gemfile
     steps:
       - name: Decode Keystore
         env:
@@ -108,6 +164,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup project and build environment
         uses: ./.github/actions/common-setup
@@ -117,6 +174,10 @@ jobs:
         with:
           ruby-version: 3.3.6
           bundler-cache: true
+          working-directory: fastlane
+
+      - name: Verify fastlane Bundler wiring
+        run: bundle exec fastlane --version
 
       - name: Assemble beta and upload to Google Play
         if: contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)

.gitignore

@@ -16,4 +16,9 @@
 /fastlane/README.md
 .kotlin
 # Screenshot test reference images (ephemeral, regenerated on demand)
-app/src/screenshotTest*/reference/
+app/src/screenshotTest*/reference/
+.codex
+protocol-research/
+_site/
+.jekyll-cache/
+vendor/bundle/

README.md

@@ -1,4 +1,4 @@
-<img src="https://github.com/d4rken-org/capod/raw/main/.assets/banner.png" width="400">
+<img src="https://github.com/d4rken-org/capod/raw/main/.assets/banner.png" width="400" alt="CAPod banner">
 
 # Companion App for AirPods (CAPod)
 
@@ -34,11 +34,20 @@ Currently supported models:
 * AirPods Pro 2. Generation (USB-C)
 * AirPods Pro 3. Generation
 * AirPods Max
+* AirPods Max (USB-C)
+* AirPods Max 2. Generation
 * Power Beats Pro
+* Power Beats Pro 2
 * Power Beats 3
 * Power Beats 4
 * Beats Solo 3
+* Beats Solo Pro
+* Beats Solo 4
+* Beats Solo Buds
 * Beats Studio 3
+* Beats Studio Buds
+* Beats Studio Buds+
+* Beats Studio Pro
 * Beats X
 * Beats Flex
 * Beats Fit Pro
@@ -87,6 +96,7 @@ Currently supported models:
   check it out.
 * [@kavishdevar](https://github.com/kavishdevar/librepods) and
   his [LibrePods project](https://github.com/kavishdevar/librepods) for sharing a lot of cool stuff.
+* [Crowdin](https://crowdin.com/) for supporting open-source projects.
 
 ## License
 

VERSION

@@ -1 +1 @@
-4.0.2-rc1 40002010
+5.1.3-rc0 50103000

_config.yml

@@ -20,9 +20,6 @@ exclude:
   - buildSrc
   - gradle/wrapper
   - fastlane
-  - Gemfile
-  - Gemfile.lock
   - crowdin*
   - app
-  - app-common
   - CONTRIBUTING.md

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name="eu.darken.capod.debug.l2cap.L2capPocActivity"
+            android:exported="true"
+            android:label="L2CAP PoC">
+            <intent-filter>
+                <action android:name="eu.darken.capod.L2CAP_POC" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

app/src/debug/java/eu/darken/capod/debug/l2cap/L2capPocActivity.kt

@@ -0,0 +1,256 @@
+package eu.darken.capod.debug.l2cap
+
+import eu.darken.capod.common.bluetooth.l2cap.L2capSocketFactory
+import android.Manifest
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothManager
+import android.bluetooth.BluetoothSocket
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.InputStream
+import java.io.OutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class L2capPocActivity : ComponentActivity() {
+
+    companion object {
+        private const val TAG = "L2capPoc"
+        private const val PSM = 0x1001
+
+        private val HANDSHAKE = byteArrayOf(
+            0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        )
+        private val ANC_OFF = byteArrayOf(
+            0x04, 0x00, 0x04, 0x00, 0x09, 0x00, 0x0d, 0x01, 0x00, 0x00, 0x00
+        )
+        private val ANC_ON = byteArrayOf(
+            0x04, 0x00, 0x04, 0x00, 0x09, 0x00, 0x0d, 0x02, 0x00, 0x00, 0x00
+        )
+        private val TRANSPARENCY = byteArrayOf(
+            0x04, 0x00, 0x04, 0x00, 0x09, 0x00, 0x0d, 0x03, 0x00, 0x00, 0x00
+        )
+    }
+
+    private val permissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { granted ->
+        if (granted) Log.d(TAG, "BLUETOOTH_CONNECT granted")
+        else Log.w(TAG, "BLUETOOTH_CONNECT denied")
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+            checkSelfPermission(Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED
+        ) {
+            permissionLauncher.launch(Manifest.permission.BLUETOOTH_CONNECT)
+        }
+
+        setContent {
+            MaterialTheme {
+                Surface(modifier = Modifier.fillMaxSize()) {
+                    PocScreen()
+                }
+            }
+        }
+    }
+
+    @OptIn(ExperimentalLayoutApi::class)
+    @SuppressLint("MissingPermission")
+    @Composable
+    private fun PocScreen() {
+        val btManager = remember { getSystemService(BluetoothManager::class.java) }
+        val adapter: BluetoothAdapter? = remember { btManager?.adapter }
+        val logEntries = remember { mutableStateListOf<String>() }
+        val logListState = rememberLazyListState()
+        var selectedDevice by remember { mutableStateOf<BluetoothDevice?>(null) }
+        var socket by remember { mutableStateOf<BluetoothSocket?>(null) }
+        var outputStream by remember { mutableStateOf<OutputStream?>(null) }
+        var connected by remember { mutableStateOf(false) }
+        val scope = rememberCoroutineScope()
+        var readerJob by remember { mutableStateOf<Job?>(null) }
+
+        val timeFmt = remember { SimpleDateFormat("HH:mm:ss.SSS", Locale.US) }
+
+        fun log(msg: String) {
+            val line = "${timeFmt.format(Date())} $msg"
+            Log.d(TAG, msg)
+            logEntries.add(line)
+        }
+
+        fun ByteArray.hex(): String = joinToString(" ") { "%02X".format(it) }
+
+        LaunchedEffect(logEntries.size) {
+            if (logEntries.isNotEmpty()) logListState.animateScrollToItem(logEntries.size - 1)
+        }
+
+        fun startReader(input: InputStream) {
+            readerJob = scope.launch(Dispatchers.IO) {
+                val buf = ByteArray(1024)
+                try {
+                    while (isActive) {
+                        val len = input.read(buf)
+                        if (len == -1) {
+                            launch(Dispatchers.Main) { log("<<< Stream closed by remote") }
+                            break
+                        }
+                        val data = buf.copyOf(len)
+                        launch(Dispatchers.Main) { log("<<< [${data.size}] ${data.hex()}") }
+                    }
+                } catch (e: Exception) {
+                    launch(Dispatchers.Main) { log("<<< Read error: ${e.message}") }
+                }
+            }
+        }
+
+        Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+            Text("L2CAP PoC — AAP Connection", style = MaterialTheme.typography.titleMedium)
+
+            if (adapter == null) {
+                Text("No Bluetooth adapter found", color = MaterialTheme.colorScheme.error)
+                return@Column
+            }
+
+            // Bonded devices
+            if (!connected) {
+                Text("Bonded Devices:", style = MaterialTheme.typography.labelLarge, modifier = Modifier.padding(top = 8.dp))
+                val bonded = remember(adapter) {
+                    try { adapter.bondedDevices?.toList() ?: emptyList() }
+                    catch (_: SecurityException) { emptyList() }
+                }
+                bonded.forEach { device ->
+                    val name = try { device.name ?: "Unknown" } catch (_: SecurityException) { "Unknown" }
+                    val isSelected = selectedDevice == device
+                    Card(
+                        modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp).clickable { selectedDevice = device },
+                        colors = if (isSelected) CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer) else CardDefaults.cardColors()
+                    ) {
+                        Row(modifier = Modifier.padding(8.dp)) {
+                            Text("$name  ${device.address}", style = MaterialTheme.typography.bodySmall)
+                        }
+                    }
+                }
+            }
+
+            // Connection controls
+            FlowRow(modifier = Modifier.padding(vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                Button(
+                    onClick = {
+                        val dev = selectedDevice ?: return@Button
+                        log("=== Connecting to ${dev.address} ===")
+                        scope.launch(Dispatchers.IO) {
+                            try {
+                                val sock = L2capSocketFactory().createSocket(dev, PSM)
+                                withContext(Dispatchers.Main) { log("Socket created, connecting...") }
+                                sock.connect()
+                                withContext(Dispatchers.Main) {
+                                    log("Connected!")
+                                    socket = sock
+                                    outputStream = sock.outputStream
+                                    connected = true
+                                }
+                                startReader(sock.inputStream)
+
+                                withContext(Dispatchers.Main) { log(">>> Handshake [${HANDSHAKE.size}] ${HANDSHAKE.hex()}") }
+                                sock.outputStream.write(HANDSHAKE)
+                                sock.outputStream.flush()
+                            } catch (e: Exception) {
+                                withContext(Dispatchers.Main) { log("Failed: ${e::class.simpleName}: ${e.message}") }
+                            }
+                        }
+                    },
+                    enabled = selectedDevice != null && !connected
+                ) { Text("Connect") }
+
+                Button(
+                    onClick = {
+                        log("=== Disconnecting ===")
+                        readerJob?.cancel()
+                        readerJob = null
+                        try { socket?.close() } catch (_: Exception) {}
+                        socket = null
+                        outputStream = null
+                        connected = false
+                    },
+                    enabled = connected
+                ) { Text("Disconnect") }
+            }
+
+            // AAP command buttons
+            if (connected) {
+                FlowRow(modifier = Modifier.padding(vertical = 4.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    fun sendCommand(name: String, cmd: ByteArray) {
+                        scope.launch(Dispatchers.IO) {
+                            try {
+                                withContext(Dispatchers.Main) { log(">>> $name [${cmd.size}] ${cmd.hex()}") }
+                                outputStream?.write(cmd)
+                                outputStream?.flush()
+                            } catch (e: Exception) {
+                                withContext(Dispatchers.Main) { log(">>> Send error: ${e.message}") }
+                            }
+                        }
+                    }
+                    Button(onClick = { sendCommand("ANC Off", ANC_OFF) }) { Text("ANC Off") }
+                    Button(onClick = { sendCommand("ANC On", ANC_ON) }) { Text("ANC On") }
+                    Button(onClick = { sendCommand("Transparency", TRANSPARENCY) }) { Text("Transparency") }
+                    Button(onClick = { sendCommand("Handshake", HANDSHAKE) }) { Text("Handshake") }
+                }
+            }
+
+            HorizontalDivider(modifier = Modifier.padding(vertical = 4.dp))
+
+            LazyColumn(state = logListState, modifier = Modifier.weight(1f)) {
+                items(logEntries) { entry ->
+                    Text(text = entry, fontFamily = FontFamily.Monospace, fontSize = 11.sp, lineHeight = 14.sp)
+                }
+            }
+        }
+    }
+}

app/src/debug/java/eu/darken/capod/screenshots/ScreenshotContent.kt

@@ -11,32 +11,28 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.graphics.toArgb
-import eu.darken.capod.R
 import eu.darken.capod.common.compose.PreviewWrapper
-import eu.darken.capod.main.ui.widget.ComposeWidgetPreview
-import eu.darken.capod.main.ui.widget.WidgetRenderState
-import eu.darken.capod.reaction.ui.popup.PopUpContent as PopUpCard
-import eu.darken.capod.main.ui.widget.WidgetConfigurationScreen
-import eu.darken.capod.main.ui.widget.WidgetConfigurationViewModel
-import eu.darken.capod.main.ui.widget.WidgetTheme
 import eu.darken.capod.common.compose.preview.MOCK_NOW
 import eu.darken.capod.common.compose.preview.MockPodDataProvider
 import eu.darken.capod.common.theming.CapodTheme
 import eu.darken.capod.main.ui.overview.OverviewScreen
 import eu.darken.capod.main.ui.overview.OverviewViewModel
-import eu.darken.capod.main.ui.settings.SettingsScreen
-import eu.darken.capod.main.ui.settings.SettingsViewModel
-import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.main.ui.widget.ComposeWidgetPreview
+import eu.darken.capod.main.ui.widget.WidgetConfigurationScreen
+import eu.darken.capod.main.ui.widget.WidgetConfigurationViewModel
+import eu.darken.capod.main.ui.widget.WidgetRenderState
+import eu.darken.capod.main.ui.widget.WidgetTheme
+import eu.darken.capod.pods.core.apple.PodModel
 import eu.darken.capod.profiles.ui.DeviceManagerScreen
 import eu.darken.capod.profiles.ui.DeviceManagerViewModel
 import eu.darken.capod.profiles.ui.creation.DeviceProfileCreationScreen
 import eu.darken.capod.profiles.ui.creation.DeviceProfileCreationViewModel
-import eu.darken.capod.reaction.core.autoconnect.AutoConnectCondition
-import eu.darken.capod.reaction.ui.ReactionSettingsScreen
-import eu.darken.capod.reaction.ui.ReactionSettingsViewModel
+import eu.darken.capod.main.ui.devicesettings.DeviceSettingsScreen
+import eu.darken.capod.main.ui.devicesettings.DeviceSettingsViewModel
+import eu.darken.capod.reaction.ui.popup.PopUpContent as PopUpCard
 
 internal const val DS = "spec:width=1080px,height=2400px,dpi=428"
 
@@ -47,20 +43,21 @@ internal fun DashboardContent() = PreviewWrapper {
             now = MOCK_NOW,
             permissions = emptySet(),
             devices = listOf(
-                MockPodDataProvider.airPodsProMixed(),
-                MockPodDataProvider.airPodsMax(),
-                MockPodDataProvider.unknownDevice(),
+                MockPodDataProvider.dualPodMonitoredMixed(),
+                MockPodDataProvider.singlePodMonitored(),
+                MockPodDataProvider.unknownMonitored(),
             ),
             isDebugMode = false,
             isBluetoothEnabled = true,
             profiles = listOf(
-                MockPodDataProvider.profile("My AirPods Pro", PodDevice.Model.AIRPODS_PRO2),
-                MockPodDataProvider.profile("AirPods Max", PodDevice.Model.AIRPODS_MAX),
+                MockPodDataProvider.profile("My AirPods Pro", PodModel.AIRPODS_PRO2),
+                MockPodDataProvider.profile("AirPods Max", PodModel.AIRPODS_MAX),
             ),
             upgradeInfo = MockPodDataProvider.gplayInfo(isPro = true),
             showUnmatchedDevices = false,
         ),
         onRequestPermission = {},
+        onBluetoothSettings = {},
         onManageDevices = {},
         onSettings = {},
         onUpgrade = {},
@@ -73,9 +70,9 @@ internal fun DeviceProfilesContent() = PreviewWrapper {
     DeviceManagerScreen(
         state = DeviceManagerViewModel.State(
             profiles = listOf(
-                MockPodDataProvider.profile("Work AirPods", PodDevice.Model.AIRPODS_PRO2),
-                MockPodDataProvider.profile("AirPods Max", PodDevice.Model.AIRPODS_MAX),
-                MockPodDataProvider.profile("Gym Beats", PodDevice.Model.POWERBEATS_PRO),
+                MockPodDataProvider.profile("Work AirPods", PodModel.AIRPODS_PRO2),
+                MockPodDataProvider.profile("AirPods Max", PodModel.AIRPODS_MAX),
+                MockPodDataProvider.profile("Gym Beats", PodModel.POWERBEATS_PRO),
             ),
         ),
         onBack = {},
@@ -92,11 +89,11 @@ internal fun AddProfileContent() = PreviewWrapper {
             name = "",
             nameError = null,
             selectedModel = null,
-            availableModels = PodDevice.Model.entries.filter { it != PodDevice.Model.UNKNOWN },
+            availableModels = PodModel.entries.filter { it != PodModel.UNKNOWN },
             identityKey = null,
             encryptionKey = null,
             selectedDevice = null,
-            bondedDevices = emptyList(),
+            bondedDeviceItems = emptyList(),
             minimumSignalQuality = 0.15f,
             canSave = false,
         ),
@@ -114,52 +111,24 @@ internal fun AddProfileContent() = PreviewWrapper {
 }
 
 @Composable
-internal fun SettingsIndexContent() = PreviewWrapper {
-    SettingsScreen(
-        state = SettingsViewModel.State(isPro = true, sponsorUrl = "https://example.com"),
-        onNavigateUp = {},
-        onGeneralSettings = {},
-        onDeviceManager = {},
-        onReactions = {},
-        onSupport = {},
-        onWiki = {},
-        onChangelog = {},
-        onHelpTranslate = {},
-        onAcknowledgements = {},
-        onPrivacyPolicy = {},
-        onSponsor = {},
-    )
-}
-
-@Composable
-internal fun ReactionSettingsContent() = PreviewWrapper {
-    ReactionSettingsScreen(
-        state = ReactionSettingsViewModel.State(
+internal fun DeviceSettingsReactionsContent() = PreviewWrapper {
+    DeviceSettingsScreen(
+        state = DeviceSettingsViewModel.State(
+            device = MockPodDataProvider.dualPodMonitoredWithReactions(),
+            now = MOCK_NOW,
             isPro = true,
-            onePodMode = false,
-            autoPlay = true,
-            autoPause = true,
-            autoConnect = false,
-            autoConnectCondition = AutoConnectCondition.WHEN_SEEN,
-            showPopUpOnCaseOpen = true,
-            showPopUpOnConnection = false,
+            isNudgeAvailable = true,
+            isClassicallyConnected = true,
         ),
         onNavigateUp = {},
-        onOnePodModeChanged = {},
-        onAutoPlayChanged = {},
-        onAutoPauseChanged = {},
-        onAutoConnectChanged = {},
-        onAutoConnectConditionSelected = {},
-        onShowPopUpOnCaseOpenChanged = {},
-        onShowPopUpOnConnectionChanged = {},
     )
 }
 
 @Composable
 internal fun WidgetConfigurationContent() = PreviewWrapper {
     val profiles = listOf(
-        MockPodDataProvider.profile("My AirPods Pro", PodDevice.Model.AIRPODS_PRO2),
-        MockPodDataProvider.profile("AirPods Max", PodDevice.Model.AIRPODS_MAX),
+        MockPodDataProvider.profile("My AirPods Pro", PodModel.AIRPODS_PRO2),
+        MockPodDataProvider.profile("AirPods Max", PodModel.AIRPODS_MAX),
     )
     WidgetConfigurationScreen(
         state = WidgetConfigurationViewModel.State(
@@ -201,7 +170,7 @@ internal fun CasePopUpContent() {
             contentAlignment = Alignment.Center,
         ) {
             PopUpCard(
-                device = MockPodDataProvider.airPodsProMixed(),
+                device = MockPodDataProvider.dualPodMonitoredMixed(),
                 onClose = {},
                 modifier = Modifier.padding(horizontal = 32.dp),
             )
@@ -261,14 +230,10 @@ private fun PreviewDeviceProfiles() = DeviceProfilesContent()
 @Composable
 private fun PreviewAddProfile() = AddProfileContent()
 
-@Preview(name = "7 - Settings", locale = "en", device = DS, showSystemUi = true)
+@Preview(name = "7 - Device Settings Reactions", locale = "en", device = DS, showSystemUi = true)
 @Composable
-private fun PreviewSettingsIndex() = SettingsIndexContent()
+private fun PreviewDeviceSettingsReactions() = DeviceSettingsReactionsContent()
 
-@Preview(name = "8 - Reaction Settings", locale = "en", device = DS, showSystemUi = true)
-@Composable
-private fun PreviewReactionSettings() = ReactionSettingsContent()
-
-@Preview(name = "9 - Homescreen Widget", device = DS, showSystemUi = true)
+@Preview(name = "8 - Homescreen Widget", device = DS, showSystemUi = true)
 @Composable
 private fun PreviewHomescreenWidget() = HomescreenWidgetContent()

app/src/foss/java/eu/darken/capod/upgrade/ui/UpgradeScreen.kt

@@ -5,14 +5,11 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -24,6 +21,8 @@ import androidx.compose.material.icons.twotone.BluetoothConnected
 import androidx.compose.material.icons.twotone.Favorite
 import androidx.compose.material.icons.twotone.Palette
 import androidx.compose.material.icons.twotone.PlayCircle
+import androidx.compose.material.icons.twotone.Headphones
+import androidx.compose.material.icons.twotone.Tune
 import androidx.compose.material.icons.twotone.Widgets
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
@@ -50,6 +49,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -108,9 +108,11 @@ fun UpgradeScreen(
     val benefits = listOf(
         Benefit(Icons.TwoTone.Palette, R.string.upgrade_benefit_themes),
         Benefit(Icons.TwoTone.PlayCircle, R.string.upgrade_benefit_autoplay),
-        Benefit(Icons.TwoTone.BluetoothConnected, R.string.upgrade_benefit_autoconnect),
+
         Benefit(Icons.AutoMirrored.TwoTone.Message, R.string.upgrade_benefit_popups),
         Benefit(Icons.TwoTone.Widgets, R.string.upgrade_benefit_widgets),
+        Benefit(Icons.TwoTone.Tune, R.string.upgrade_benefit_device_settings),
+        Benefit(Icons.TwoTone.Headphones, R.string.upgrade_benefit_device_controls),
         Benefit(Icons.TwoTone.Favorite, R.string.upgrade_benefit_support),
     )
 
@@ -118,138 +120,144 @@ fun UpgradeScreen(
         snackbarHost = { SnackbarHost(snackbarHostState) },
         containerColor = MaterialTheme.colorScheme.surface,
     ) { paddingValues ->
-    Box(modifier = Modifier
-        .windowInsetsPadding(WindowInsets.systemBars)
-        .padding(paddingValues)
-    ) {
-        Column(
-            modifier = Modifier
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Box(contentAlignment = Alignment.Center) {
-                Surface(
-                    modifier = Modifier.size(120.dp),
-                    shape = CircleShape,
-                    color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f),
-                ) {}
-                Image(
-                    painter = painterResource(R.drawable.splash_graphic2),
-                    contentDescription = null,
-                    modifier = Modifier.size(80.dp),
-                )
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Text(
-                text = buildAnnotatedString {
-                    append("CAPod ")
-                    withStyle(SpanStyle(color = colorResource(R.color.brand_secondary), fontWeight = FontWeight.Bold)) {
-                        append("FOSS")
-                    }
-                },
-                style = MaterialTheme.typography.headlineLarge,
-                color = MaterialTheme.colorScheme.onSurface,
-            )
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            Card(
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                ),
-                modifier = Modifier.fillMaxWidth(),
+        Box(modifier = Modifier.padding(paddingValues)) {
+            Column(
+                modifier = Modifier
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 24.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
             ) {
+                Spacer(modifier = Modifier.height(48.dp))
+
+                Box(contentAlignment = Alignment.Center) {
+                    Surface(
+                        modifier = Modifier.size(120.dp),
+                        shape = CircleShape,
+                        color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f),
+                    ) {}
+                    Image(
+                        painter = painterResource(R.drawable.splash_graphic2),
+                        contentDescription = null,
+                        modifier = Modifier.size(80.dp),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
                 Text(
-                    text = stringResource(R.string.upgrade_foss_preamble),
-                    style = MaterialTheme.typography.bodyMedium,
-                    modifier = Modifier.padding(16.dp),
+                    text = buildAnnotatedString {
+                        append("CAPod ")
+                        withStyle(SpanStyle(color = colorResource(R.color.brand_secondary), fontWeight = FontWeight.Bold)) {
+                            append("FOSS")
+                        }
+                    },
+                    style = MaterialTheme.typography.headlineLarge,
+                    color = MaterialTheme.colorScheme.onSurface,
                 )
-            }
 
-            Spacer(modifier = Modifier.height(16.dp))
+                Spacer(modifier = Modifier.height(24.dp))
 
-            Card(
-                modifier = Modifier.fillMaxWidth(),
-            ) {
-                Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                    benefits.forEach { benefit ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 12.dp, vertical = 4.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Surface(
-                                shape = RoundedCornerShape(8.dp),
-                                color = MaterialTheme.colorScheme.secondaryContainer,
-                                modifier = Modifier.size(28.dp),
+                Card(
+                    colors = CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.secondaryContainer,
+                    ),
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Text(
+                        text = stringResource(R.string.upgrade_foss_preamble),
+                        style = MaterialTheme.typography.bodyMedium,
+                        modifier = Modifier.padding(16.dp),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Card(
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Column(modifier = Modifier.padding(vertical = 4.dp)) {
+                        benefits.forEach { benefit ->
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 12.dp, vertical = 4.dp),
+                                verticalAlignment = Alignment.CenterVertically,
                             ) {
-                                Box(contentAlignment = Alignment.Center) {
-                                    Icon(
-                                        imageVector = benefit.icon,
-                                        contentDescription = null,
-                                        tint = MaterialTheme.colorScheme.onSecondaryContainer,
-                                        modifier = Modifier.size(16.dp),
-                                    )
+                                Surface(
+                                    shape = RoundedCornerShape(8.dp),
+                                    color = MaterialTheme.colorScheme.secondaryContainer,
+                                    modifier = Modifier.size(28.dp),
+                                ) {
+                                    Box(contentAlignment = Alignment.Center) {
+                                        Icon(
+                                            imageVector = benefit.icon,
+                                            contentDescription = null,
+                                            tint = MaterialTheme.colorScheme.onSecondaryContainer,
+                                            modifier = Modifier.size(16.dp),
+                                        )
+                                    }
                                 }
+                                Spacer(modifier = Modifier.width(12.dp))
+                                Text(
+                                    text = stringResource(benefit.textRes),
+                                    style = MaterialTheme.typography.bodyLarge,
+                                )
                             }
-                            Spacer(modifier = Modifier.width(12.dp))
-                            Text(
-                                text = stringResource(benefit.textRes),
-                                style = MaterialTheme.typography.bodyLarge,
-                            )
                         }
                     }
                 }
+
+                Text(
+                    text = stringResource(R.string.upgrade_benefit_disclaimer),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(top = 8.dp),
+                )
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Button(
+                    onClick = onSponsor,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(52.dp),
+                    shape = RoundedCornerShape(12.dp),
+                ) {
+                    Icon(
+                        imageVector = Icons.TwoTone.Favorite,
+                        contentDescription = null,
+                        modifier = Modifier.size(20.dp),
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(
+                        text = stringResource(R.string.upgrade_foss_sponsor_action),
+                        style = MaterialTheme.typography.titleMedium,
+                    )
+                }
+
+                Text(
+                    text = stringResource(R.string.upgrade_foss_sponsor_subtitle),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.padding(top = 8.dp),
+                )
+
+                Spacer(modifier = Modifier.height(24.dp))
             }
 
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Button(
-                onClick = onSponsor,
+            IconButton(
+                onClick = onNavigateUp,
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .height(52.dp),
-                shape = RoundedCornerShape(12.dp),
+                    .align(Alignment.TopStart)
+                    .padding(4.dp),
             ) {
                 Icon(
-                    imageVector = Icons.TwoTone.Favorite,
+                    imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
                     contentDescription = null,
-                    modifier = Modifier.size(20.dp),
-                )
-                Spacer(modifier = Modifier.width(8.dp))
-                Text(
-                    text = stringResource(R.string.upgrade_foss_sponsor_action),
-                    style = MaterialTheme.typography.titleMedium,
                 )
             }
-
-            Text(
-                text = stringResource(R.string.upgrade_foss_sponsor_subtitle),
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(top = 8.dp),
-            )
-
-            Spacer(modifier = Modifier.height(24.dp))
         }
-
-        IconButton(
-            onClick = onNavigateUp,
-            modifier = Modifier.padding(4.dp),
-        ) {
-            Icon(
-                imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.onSurface,
-            )
-        }
-    }
     }
 }
 

app/src/foss/res/values-af-rZA/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Borg ontwikkeling</string>
     <string name="upgrade_foss_sponsor_subtitle">Geen advertensies. Geen opsporing. Geen Google Play-binding.</string>
     <string name="upgrade_foss_sponsor_returned_early">Alreeds terug? U ondersteuning hou CAPod aan die lewe.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-am/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ልማትን ይደግፉ</string>
     <string name="upgrade_foss_sponsor_subtitle">ምንም ማስታወቂያ የሉም። ምንም ክትትል የሉም። ምንም Google Play ቆለፋ የሉም።</string>
     <string name="upgrade_foss_sponsor_returned_early">ቀድሞ ተመለሱ፡ ድጋፏዎ CAPodን ህያው ያቆይላል።</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ar/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ادعم التطوير</string>
     <string name="upgrade_foss_sponsor_subtitle">لا إعلانات. لا تتبع. لا قيود على Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">عدت بسرعة؟ دعمك يبقي CAPod حياً.</string>
+    <string name="upgrade_badge_label">البرمجيات الحرة (FOSS)</string>
 </resources>

app/src/foss/res/values-az/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">İnkişafı sponsor edin</string>
     <string name="upgrade_foss_sponsor_subtitle">Reklam yoxdur. İzləmə yoxdur. Google Play bağlılığı yoxdur.</string>
     <string name="upgrade_foss_sponsor_returned_early">Artıq geri qayıtdınız? Dəstəyiniz CAPod-u yaşadır.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-be/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Падтрымаць распрацоўку</string>
     <string name="upgrade_foss_sponsor_subtitle">Ніякай рэкламы. Ніякай адсочкі. Ніякай залежнасці ад Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Ужо вяртаецеся? Ваша падтрымка трымае CAPod ў жывых.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-bg/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Спонсорирайте разработката</string>
     <string name="upgrade_foss_sponsor_subtitle">Без реклами. Без следене. Без заключване в Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Вече ли? Вашата подкрепа поддържа CAPod жив.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-bn-rBD/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">স্পনসর ডেভলপমেন্ট</string>
     <string name="upgrade_foss_sponsor_subtitle">কোনো বিজ্ঞাপন নেই। কোনো ট্র্যাকিং নেই। Google Play-এর সাথে বাঁধানো নেই।</string>
     <string name="upgrade_foss_sponsor_returned_early">ইতোমধ্যে ফিরে গেলেন? আপনার সমর্থন CAPodকে বাঁচিয়ে রাখে।</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ca/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocina el desenvolupament</string>
     <string name="upgrade_foss_sponsor_subtitle">Sense anuncis. Sense seguiment. Sense dependència del Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Ja heu tornat? El vostre suport manté viu el CAPod.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-cs/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponzorovat vývoj</string>
     <string name="upgrade_foss_sponsor_subtitle">Žádné reklamy. Žádné sledování. Žádná závislost na Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Už jste zpět? Vaše podpora udržuje CAPod naživu.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-da/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsorudvikling</string>
     <string name="upgrade_foss_sponsor_subtitle">Ingen annoncer. Ingen sporing. Ingen Google Play-lås.</string>
     <string name="upgrade_foss_sponsor_returned_early">Allerede tilbage? Din støtte holder CAPod i live.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-de/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Fördere Entwicklung</string>
     <string name="upgrade_foss_sponsor_subtitle">Keine Werbung. Kein Tracking. Keine Google-Play-Bindung.</string>
     <string name="upgrade_foss_sponsor_returned_early">Schon zurück? Deine Unterstützung hält CAPod am Leben.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-el/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Χορηγήστε την ανάπτυξη</string>
     <string name="upgrade_foss_sponsor_subtitle">Χωρίς διαφημίσεις. Χωρίς παρακολούθηση. Χωρίς δέσμευση στο Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Επιστρέψατε ήδη; Η υποστήριξή σας κρατά το CAPod ζωντανό.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-es-rAR/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsorear el desarrollo</string>
     <string name="upgrade_foss_sponsor_subtitle">Sin publicidad. Sin rastreo. Sin dependencia de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">¿Ya te vas? Tu apoyo mantiene CAPod vivo.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-es-rMX/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocinar el desarrollo</string>
     <string name="upgrade_foss_sponsor_subtitle">Sin anuncios. Sin rastreo. Sin dependencia de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">¿Ya de vuelta? Tu apoyo mantiene CAPod con vida.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-es/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocinadores</string>
     <string name="upgrade_foss_sponsor_subtitle">Sin anuncios. Sin rastreo. Sin dependencia de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">¿Ya de vuelta? Tu apoyo mantiene CAPod vivo.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-et-rEE/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Rahasta arendamist</string>
     <string name="upgrade_foss_sponsor_subtitle">Reklaami pole. Jälgimist pole. Google Play lukustust pole.</string>
     <string name="upgrade_foss_sponsor_returned_early">Juba tagasi? Sinu toetus hoiab CAPodi elus.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-eu-rES/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Garapena babestu</string>
     <string name="upgrade_foss_sponsor_subtitle">Iragarkirik ez. Jarraipenik ez. Google Play-ren lotura ez.</string>
     <string name="upgrade_foss_sponsor_returned_early">Dagoeneko itzuli? Zure laguntzak CAPod bizirik mantentzen du.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-fa/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">حامی توسعه دهنده</string>
     <string name="upgrade_foss_sponsor_subtitle">بدون تبلیغ. بدون ردیابی. بدون وابستگی به Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">زود برگشتیدی؟ حمایت شما CAPod را زنده نگه می‌دارد.</string>
+    <string name="upgrade_badge_label">منبع‌آزاد</string>
 </resources>

app/src/foss/res/values-fi/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsoroi kehitystä</string>
     <string name="upgrade_foss_sponsor_subtitle">Ei mainoksia. Ei seurantaa. Ei Google Play -riippuvuutta.</string>
     <string name="upgrade_foss_sponsor_returned_early">Jo takaisin? Tukesi pitää CAPod-sovelluksen hengissä.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-fil/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Mag-sponsor ng development</string>
     <string name="upgrade_foss_sponsor_subtitle">Walang ads. Walang tracking. Walang Google Play lock-in.</string>
     <string name="upgrade_foss_sponsor_returned_early">Bumalik na? Ang iyong suporta ay nagpapanatiling buhay ng CAPod.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-fr/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Soutenir le développement</string>
     <string name="upgrade_foss_sponsor_subtitle">Pas de publicités. Pas de suivi à la trace. Pas de dépendance à Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Déjà de retour ? Votre soutien maintient CAPod en vie.</string>
+    <string name="upgrade_badge_label">Logiciel libre</string>
 </resources>

app/src/foss/res/values-gl-rES/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocinar desenvolvemento</string>
     <string name="upgrade_foss_sponsor_subtitle">Sen anuncios. Sen rastrexo. Sen dependencia de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">És rápido/a! O teu apoio mantén CAPod vivo.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-hi-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">विकास को प्रायोजक करें</string>
     <string name="upgrade_foss_sponsor_subtitle">कोई विज्ञापन नहीं। कोई ट्रैकिंग नहीं। Google Play पर निर्भरता नहीं।</string>
     <string name="upgrade_foss_sponsor_returned_early">अभी वापस? आपका समर्थन CAPod को जीवित रखता है।</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-hr/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Podržite razvoj</string>
     <string name="upgrade_foss_sponsor_subtitle">Bez oglasa. Bez praćenja. Bez zaključanosti na Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Već se vraćate? Vaša podrška čuva CAPod na životu.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-hu/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Szponzori fejlesztés</string>
     <string name="upgrade_foss_sponsor_subtitle">Nincs hirdetés. Nincs nyomkövetés. Nincs Google Play-függőség.</string>
     <string name="upgrade_foss_sponsor_returned_early">Már visszamész? A támogatásodnak köszönhetően él tovább a CAPod.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-hy-rAM/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Հովանավորել զարգացումը</string>
     <string name="upgrade_foss_sponsor_subtitle">Լրատնություն չկա: հետքխկություն չկա: Google Play-ի կապվածություն չկա:</string>
     <string name="upgrade_foss_sponsor_returned_early">Արդևն հետ? ձևր աիկտակցությունը CAPod-ին կենդանի պահում:</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-in/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Pengembangan sponsor</string>
     <string name="upgrade_foss_sponsor_subtitle">Tanpa iklan. Tanpa pelacakan. Tanpa ketergantungan Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Sudah kembali? Dukungan Anda menjaga CAPod tetap hidup.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-is/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Styrkja þróun</string>
     <string name="upgrade_foss_sponsor_subtitle">Engar auglysíngar. Engin rakning. Ekkert Google Play-lás.</string>
     <string name="upgrade_foss_sponsor_returned_early">Aftur þegar? Styðjað þít heldur CAPod lifandi.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-it/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Finanzia lo sviluppo</string>
     <string name="upgrade_foss_sponsor_subtitle">Nessuna pubblicità. Nessun tracciamento. Nessun vincolo con Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Già via? Il tuo supporto mantiene CAPod in vita.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-iw/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">פיתוח חסות</string>
     <string name="upgrade_foss_sponsor_subtitle">אין פרסומות. אין מעקב. אין תלות ב-Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">כבר חוזר? התמיכה שלך שומרת את CAPod בחיים.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ja/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">開発支援者</string>
     <string name="upgrade_foss_sponsor_subtitle">広告なし。追跡なし。Google Play依存なし。</string>
     <string name="upgrade_foss_sponsor_returned_early">もう戻りますか？あなたのサポートがCAPodを支えています。</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ka-rGE/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">სპონსორის განვითარება</string>
     <string name="upgrade_foss_sponsor_subtitle">რეკლამა არა. თვალთვალება არა. Google Play-ზე დამოკიდება არა.</string>
     <string name="upgrade_foss_sponsor_returned_early">უკვე დაბრუნდით? თქვენი მხარდაჯერა CAPod-ს გადარჩენებას ეხმარება.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-km-rKH/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ឧបត្ថម្ភការអភិវឌ្ឍន៍</string>
     <string name="upgrade_foss_sponsor_subtitle">គ្មានការផ្សាយពាណិជ្ជកម្ម។ គ្មានការតាមដាន។ គ្មានការចាក់សោ Google Play។</string>
     <string name="upgrade_foss_sponsor_returned_early">ត្រលប់មកវិញហើយ។? ការគាំទ្ររបស់អ្នកចិញ្ចឹម CAPod ឥ្សរិយនៅរស់។</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-kmr-rTR/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Pêşdebiriyê teref bike</string>
     <string name="upgrade_foss_sponsor_subtitle">Reklam tune. Śopandin tune. Girêdana Google Play tune.</string>
     <string name="upgrade_foss_sponsor_returned_early">Zirû vegeriya? Piştgiriya we CAPod sax dihêle.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-kn-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ಅಭಿವೃದ್ಧಿಗೆ ಪ್ರಾಯೋಜಕತ್ವ ನೀಡಿ</string>
     <string name="upgrade_foss_sponsor_subtitle">ಜಾಹೀರಾತುಗಳಿಲ್ಲ. ಭಕ್ಷಣೆ ಇಲ್ಲ. Google Play ಲಾಕ್-ಇನ್ ಇಲ್ಲ.</string>
     <string name="upgrade_foss_sponsor_returned_early">ಇಷ್ಟೇ ಹಿಂದಿರುಗಿದಿರಿ? ನಿಮ್ಮ ಬೆಂಬಲ CAPod ಅನ್ನು ಜೀವಂತವಾಗಿಡುತ್ತದೆ.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ko/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">개발 후원하기</string>
     <string name="upgrade_foss_sponsor_subtitle">광고 없음. 추적 없음. Google Play 의존 없음.</string>
     <string name="upgrade_foss_sponsor_returned_early">벌써 돌아가세요? 여러분의 지원이 CAPod를 유지합니다.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ky-rKG/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Иштелеп чыгууну колдоо</string>
     <string name="upgrade_foss_sponsor_subtitle">Жарнама. Кадалоолоо жок. Google Playга байланма.</string>
     <string name="upgrade_foss_sponsor_returned_early">Артка кайттыңызбы? Сиздин колдооңуз CAPodты тирүү сактайт.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-lo-rLA/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ສະໜັບສະໜູນການພັດທະນາ</string>
     <string name="upgrade_foss_sponsor_subtitle">ບໍ່ມີໂຄສະນາ. ບໍ່ມີການຕິດຕາມ. ບໍ່ຕິດ Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">ກັບມາແລ້ວ? ການສະໜັບສະໜູນຂອງທ່ານຮັກສາ CAPod ໃຫ້ດຳເນີນຕໍ່ໄປ.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-lt/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Remti plėtrą</string>
     <string name="upgrade_foss_sponsor_subtitle">Jokių reklamų. Jokio sekimo. Jokio „Google Play“ priklausomybės.</string>
     <string name="upgrade_foss_sponsor_returned_early">Jau grįžte? Jūsų parama palaiko CAPod gyvybę.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-lv/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsorēt attīstību</string>
     <string name="upgrade_foss_sponsor_subtitle">Bez reklamām. Bez seklōšanas. Bez Google Play saistībām.</string>
     <string name="upgrade_foss_sponsor_returned_early">Jau atpakaļ? Jūsu atbalsts uztur CAPod pie dzīvības.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-mk-rMK/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Спонзорирај развој</string>
     <string name="upgrade_foss_sponsor_subtitle">Без реклами. Без пратење. Без зависност од Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Веќе се вративте? Вашата поддршка го одржува CAPod жив.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ml-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">വികസനം സ്പോൺസർ ചെയ്യുക</string>
     <string name="upgrade_foss_sponsor_subtitle">പരസ്യങ്ങൾ ഇല്ല. ട്രാക്കിംഗ് ഇല്ല. Google Play ലോക്ക്-ഇൻ ഇല്ല.</string>
     <string name="upgrade_foss_sponsor_returned_early">ഇത്ര പെട്ടെന്ന് തിരിച്ചു പോകുന്നോ? നിങ്ങളുടെ പിന്തുണ CAPod നിലനിർത്തുന്നു.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-mn-rMN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Хөгжлийг дэмжих</string>
     <string name="upgrade_foss_sponsor_subtitle">Реклам байхгүй. Хяналт байхгүй. Google Play-д хамааралгүй.</string>
     <string name="upgrade_foss_sponsor_returned_early">Аль хэдэйн буцаж ирлээ? Таны дэмжлэг CAPod-ийг амьд байлгадаг.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-mr-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">विकासास प्रायोजित करा</string>
     <string name="upgrade_foss_sponsor_subtitle">कोणत्याही जाहिराती नाहीत. कोणतेही ट्रॅकिंग नाही. Google Play चे बंधन नाही.</string>
     <string name="upgrade_foss_sponsor_returned_early">आधीच परत? तुमचा पाठिंबा CAPod जिवंत ठेवतो.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ms/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Pembangunan penaja</string>
     <string name="upgrade_foss_sponsor_subtitle">Tiada iklan. Tiada penjejakan. Tiada ikatan Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Sudah kembali? Sokongan anda mengekalkan CAPod.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-my-rMM/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ဖွံ့ဖြိုးတိုးတက်မှုကို ကမကထပံ့ပိုးရန်</string>
     <string name="upgrade_foss_sponsor_subtitle">ကြောင်ညာမရှိ။ ခြေရာမခံ။ Google Play ချုပ်ချယ်မြုမရှိ။</string>
     <string name="upgrade_foss_sponsor_returned_early">ပြန်သွားပြီးလါ? သင်၏ ပံ့ပိုးမှု CAPod ကို ရှင်သန်ဆက်လက်ကေစေသည်။</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-nb/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Støtt utviklingen</string>
     <string name="upgrade_foss_sponsor_subtitle">Ingen reklame. Ingen sporing. Ingen Google Play-avhengighet.</string>
     <string name="upgrade_foss_sponsor_returned_early">Allerede tilbake? Din støtte holder CAPod i live.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ne-rNP/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">विकासलाई प्रायोजन गर्नुहोस्</string>
     <string name="upgrade_foss_sponsor_subtitle">कुनै विज्ञापन छैन। कुनै ट्रैकिङ छैन। Google Playमा बाँधिएको छैन।</string>
     <string name="upgrade_foss_sponsor_returned_early">पहिले नै फिर्नुभयो? तपाईंको सहयोगले CAPod जीवित राख्छ।</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-nl/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsor ontwikkeling</string>
     <string name="upgrade_foss_sponsor_subtitle">Geen advertenties. Geen tracking. Geen Google Play-vergrendeling.</string>
     <string name="upgrade_foss_sponsor_returned_early">Alweer terug? Jouw steun houdt CAPod in leven.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-pl/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Wesprzyj rozwój</string>
     <string name="upgrade_foss_sponsor_subtitle">Bez reklam. Bez śledzenia. Bez uzależnienia od Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Już wróciłeś? Twoje wsparcie utrzymuje CAPod przy życiu.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-pt-rBR/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocinador do desenvolvimento</string>
     <string name="upgrade_foss_sponsor_subtitle">Sem anúncios. Sem rastreamento. Sem dependência do Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Já voltou? Seu apoio mantém o CAPod vivo.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-pt/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Patrocine o desenvolvimento</string>
     <string name="upgrade_foss_sponsor_subtitle">Sem anúncios. Sem rastreamento. Sem dependência do Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Já está a sair? O seu apoio mantém o CAPod ativo.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-rm/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsurisar il sviluppament</string>
     <string name="upgrade_foss_sponsor_subtitle">Nagins annunzis. Nagin tracking. Nagin blocadi da Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Gia enavos? Tes sustegn mantegn CAPod viv.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ro/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsorizează dezvoltarea</string>
     <string name="upgrade_foss_sponsor_subtitle">Fara reclame. Fara urmarire. Fara dependenta de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Ati revenit deja? Sprijinul dvs. mentine CAPod in viata.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ru/strings.xml

@@ -3,8 +3,9 @@
     <string name="foss_upgrade_donate_label">Пожертвовать</string>
     <string name="foss_upgrade_alreadydonated_label">Я уже пожертвовал</string>
     <string name="foss_upgrade_no_money_label">Я потратил все свои деньги на AirPods</string>
-    <string name="upgrade_foss_preamble">CAPod FOSS бесплатный и с открытым исходным кодом. Если вам полезно приложение, рассмотрите возможность спонсировать разработку, чтобы помочь проекту продолжать развиваться.</string>
+    <string name="upgrade_foss_preamble">CAPod FOSS бесплатный и с открытым исходным кодом. Если Вам полезно приложение, рассмотрите возможность спонсировать разработку, чтобы помочь проекту продолжать развиваться.</string>
     <string name="upgrade_foss_sponsor_action">Поддержать разработку</string>
     <string name="upgrade_foss_sponsor_subtitle">Без рекламы. Без слежки. Без привязки к Google Play.</string>
-    <string name="upgrade_foss_sponsor_returned_early">Вернулись уже? Ваша поддержка помогает CAPod жить.</string>
+    <string name="upgrade_foss_sponsor_returned_early">Вернулись? Ваша поддержка помогает CAPod жить.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sc-rIT/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsoriza s\'isvilupu</string>
     <string name="upgrade_foss_sponsor_subtitle">Peroe publicidade. Peroe trachiamentu. Peroe dipendentzia de Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Zas torradas giai? Su sostegnu tuyu mantenet CAPod in vida.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-si-rLK/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">සංවර්ධනයට අනුග්‍රහය දෙන්න</string>
     <string name="upgrade_foss_sponsor_subtitle">අළු නැත. ට්‍රැකිං නැත. Google Play සලක඾ත්වය නැත.</string>
     <string name="upgrade_foss_sponsor_returned_early">එක්බේන්මට පළ්ට? ඔබ෪් සහය් CAPod ක්‍රියාත්මකව තබා ගෙනයි.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sk/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponzorovaný vývoj</string>
     <string name="upgrade_foss_sponsor_subtitle">Žiadne reklamy. Žiadne sledovanie. Žiadna závislosť od Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Už späť? Vaša podpora udržiava CAPod pri živote.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sl/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Podpri razvoj</string>
     <string name="upgrade_foss_sponsor_subtitle">Brez oglasov. Brez sledenja. Brez vezave na Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Že nazaj? Vaša podpora ohranja CAPod pri življenju.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sq-rAL/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Zhvillimi i sponsorëve</string>
     <string name="upgrade_foss_sponsor_subtitle">Pa reklama. Pa gjurmim. Pa varësi nga Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Ktheheni tashmjë? Mbështjetja juaj e mban CAPod gjallë.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sr/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Спонзориши развој</string>
     <string name="upgrade_foss_sponsor_subtitle">Без реклама. Без праћења. Без зависности од Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Већ одлазите? Ваша подршка чува CAPod живим.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sv/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsra utvecklingen</string>
     <string name="upgrade_foss_sponsor_subtitle">Inga annonser. Ingen spårning. Ingen bindning till Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Redan tillbaka? Ditt stöd håller CAPod vid liv.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-sw/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Faidhi maendeleo</string>
     <string name="upgrade_foss_sponsor_subtitle">Hakuna matangazo. Hakuna ufuatiliaji. Hakuna kufungwa kwa Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Unarudi tayari? Msaada wako unaweka CAPod iwe hai.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ta-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">மேம்பாட்டை ஸ்பான்சர் செய்யுங்கள்</string>
     <string name="upgrade_foss_sponsor_subtitle">ஐவிளம்பரம் இல்லை. கண்காணிப்பு இல்லை. Google Play கட்டுப்பாட்டு இல்லை.</string>
     <string name="upgrade_foss_sponsor_returned_early">இத்தனை இருக்கிறீரகளா? உங்கள் ஆதரவு CAPodஐ உயிருடன் வைத்திருக்கிறது.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-te-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">అభివృద్ధిని స్పాన్సర్ చేయండి</string>
     <string name="upgrade_foss_sponsor_subtitle">జాహీరాతులు లేవు. ట్రాకింగ్ లేదు. Google Play ఒక్కటికి పరిమితం కాదు.</string>
     <string name="upgrade_foss_sponsor_returned_early">ఇర్వై వెనక్కి వెళ్ళారా? మీ మద్దతు CAPodను సజీవంగా ఉంచుతుంది.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-th/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">สปอนเซอร์การพัฒนา</string>
     <string name="upgrade_foss_sponsor_subtitle">ไม่มีโฆษณา ไม่ติดตาม ไม่ผูกขาด Google Play</string>
     <string name="upgrade_foss_sponsor_returned_early">กลับมาแล้ว? การสนับสนุนของคุณช่วยให้ CAPod ดำเนินต่อไป</string>
+    <string name="upgrade_badge_label">บังคับ</string>
 </resources>

app/src/foss/res/values-tr/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Geliştirmeyi destekleyin</string>
     <string name="upgrade_foss_sponsor_subtitle">Reklam yok. Takip yok. Google Play sınırlaması yok.</string>
     <string name="upgrade_foss_sponsor_returned_early">Şimdiden döndün mü? Desteğin CAPod\'u ayakta tutuyor.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-uk/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Розвиток спонсорів</string>
     <string name="upgrade_foss_sponsor_subtitle">Без реклами. Без стеження. Без прив\'язки до Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Вже повертаєтеся? Ваша підтримка зберігає CAPod.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-ur-rIN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">ترقی کو اسپانسر کریں</string>
     <string name="upgrade_foss_sponsor_subtitle">کوئی اشتہار نہیں۔ کوئی ٹریکنگ نہیں۔ کوئی Google Play کی قید نہیں۔</string>
     <string name="upgrade_foss_sponsor_returned_early">پہلے ہی واپس؟ آپ کی مدد CAPod کو زندہ رکھتی ہے۔</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-uz/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Rivojlanishni sponsorlik qilish</string>
     <string name="upgrade_foss_sponsor_subtitle">Reklamasiz. Kuzatishsiz. Google Play cheklovlarisiz.</string>
     <string name="upgrade_foss_sponsor_returned_early">Allaqachon qaytdingizmi? Sizning yordamingiz CAPod\'ni tirik saqlaydi.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-vi/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Tài trợ nhà phát triển</string>
     <string name="upgrade_foss_sponsor_subtitle">Không quảng cáo. Không theo dõi. Không phụ thuộc Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Quay lại rồi sao? Sự ủng hộ của bạn giúp CAPod tiếp tục tồn tại.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-zh-rCN/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">赞助开发</string>
     <string name="upgrade_foss_sponsor_subtitle">无广告。无追踪。无 Google Play 绑定。</string>
     <string name="upgrade_foss_sponsor_returned_early">已经回去了？您的支持是 CAPod 生存的动力。</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-zh-rHK/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">贊助開發</string>
     <string name="upgrade_foss_sponsor_subtitle">沒有廣告。沒有追蹤。沒有 Google Play 鎖定。</string>
     <string name="upgrade_foss_sponsor_returned_early">這麼快就要離開？您的支持讓 CAPod 繼續存活。</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-zh-rTW/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">贊助開發</string>
     <string name="upgrade_foss_sponsor_subtitle">無廣告。無追蹤。無 Google Play 鎖定。</string>
     <string name="upgrade_foss_sponsor_returned_early">已經回容了？您的支持讓 CAPod 繼續運行。</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values-zu/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Xhasa ukuthuthukiswa</string>
     <string name="upgrade_foss_sponsor_subtitle">Azikho izibhangeli. Akunakulandelelwa. Ayikho ukuvinjwa kwe-Google Play.</string>
     <string name="upgrade_foss_sponsor_returned_early">Ubuyile? Ukwesekwa kwakho kugcina i-CAPod iphila.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/foss/res/values/strings.xml

@@ -7,4 +7,5 @@
     <string name="upgrade_foss_sponsor_action">Sponsor development</string>
     <string name="upgrade_foss_sponsor_subtitle">No ads. No tracking. No Google Play lock-in.</string>
     <string name="upgrade_foss_sponsor_returned_early">Back already? Your support keeps CAPod alive.</string>
+    <string name="upgrade_badge_label">FOSS</string>
 </resources>

app/src/gplay/java/eu/darken/capod/upgrade/ui/UpgradeScreen.kt

@@ -7,14 +7,11 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -27,6 +24,8 @@ import androidx.compose.material.icons.twotone.Favorite
 import androidx.compose.material.icons.twotone.Palette
 import androidx.compose.material.icons.twotone.PlayCircle
 import androidx.compose.material.icons.twotone.Stars
+import androidx.compose.material.icons.twotone.Headphones
+import androidx.compose.material.icons.twotone.Tune
 import androidx.compose.material.icons.twotone.Widgets
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
@@ -37,6 +36,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -122,125 +122,140 @@ fun UpgradeScreen(
     val benefits = listOf(
         Benefit(Icons.TwoTone.Palette, R.string.upgrade_benefit_themes),
         Benefit(Icons.TwoTone.PlayCircle, R.string.upgrade_benefit_autoplay),
-        Benefit(Icons.TwoTone.BluetoothConnected, R.string.upgrade_benefit_autoconnect),
+
         Benefit(Icons.AutoMirrored.TwoTone.Message, R.string.upgrade_benefit_popups),
         Benefit(Icons.TwoTone.Widgets, R.string.upgrade_benefit_widgets),
+        Benefit(Icons.TwoTone.Tune, R.string.upgrade_benefit_device_settings),
+        Benefit(Icons.TwoTone.Headphones, R.string.upgrade_benefit_device_controls),
         Benefit(Icons.TwoTone.Favorite, R.string.upgrade_benefit_support),
     )
 
-    Box(modifier = Modifier.windowInsetsPadding(WindowInsets.systemBars)) {
-        Column(
-            modifier = Modifier
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Box(contentAlignment = Alignment.Center) {
-                Surface(
-                    modifier = Modifier.size(120.dp),
-                    shape = CircleShape,
-                    color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f),
-                ) {}
-                Image(
-                    painter = painterResource(R.drawable.splash_graphic2),
-                    contentDescription = null,
-                    modifier = Modifier.size(80.dp),
-                )
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Text(
-                text = buildAnnotatedString {
-                    append("CAPod ")
-                    withStyle(SpanStyle(color = colorResource(R.color.brand_tertiary), fontWeight = FontWeight.Bold)) {
-                        append("Pro")
-                    }
-                },
-                style = MaterialTheme.typography.headlineLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-            )
-
-            Spacer(modifier = Modifier.height(24.dp))
-
-            Card(
-                colors = CardDefaults.cardColors(
-                    containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                ),
-                modifier = Modifier.fillMaxWidth(),
+    Scaffold(
+        containerColor = MaterialTheme.colorScheme.surface,
+    ) { paddingValues ->
+        Box(modifier = Modifier.padding(paddingValues)) {
+            Column(
+                modifier = Modifier
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 24.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
             ) {
+                Spacer(modifier = Modifier.height(48.dp))
+
+                Box(contentAlignment = Alignment.Center) {
+                    Surface(
+                        modifier = Modifier.size(120.dp),
+                        shape = CircleShape,
+                        color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f),
+                    ) {}
+                    Image(
+                        painter = painterResource(R.drawable.splash_graphic2),
+                        contentDescription = null,
+                        modifier = Modifier.size(80.dp),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
                 Text(
-                    text = stringResource(R.string.upgrade_preamble),
-                    style = MaterialTheme.typography.bodyMedium,
-                    modifier = Modifier.padding(16.dp),
+                    text = buildAnnotatedString {
+                        append("CAPod ")
+                        withStyle(SpanStyle(color = colorResource(R.color.brand_tertiary), fontWeight = FontWeight.Bold)) {
+                            append("Pro")
+                        }
+                    },
+                    style = MaterialTheme.typography.headlineLarge,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
-            }
 
-            Spacer(modifier = Modifier.height(24.dp))
+                Spacer(modifier = Modifier.height(24.dp))
 
-            Card(
-                modifier = Modifier.fillMaxWidth(),
-            ) {
-                Column(modifier = Modifier.padding(vertical = 4.dp)) {
-                    benefits.forEach { benefit ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(horizontal = 12.dp, vertical = 4.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Surface(
-                                shape = RoundedCornerShape(8.dp),
-                                color = MaterialTheme.colorScheme.primaryContainer,
-                                modifier = Modifier.size(28.dp),
+                Card(
+                    colors = CardDefaults.cardColors(
+                        containerColor = MaterialTheme.colorScheme.secondaryContainer,
+                    ),
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Text(
+                        text = stringResource(R.string.upgrade_preamble),
+                        style = MaterialTheme.typography.bodyMedium,
+                        modifier = Modifier.padding(16.dp),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(24.dp))
+
+                Card(
+                    modifier = Modifier.fillMaxWidth(),
+                ) {
+                    Column(modifier = Modifier.padding(vertical = 4.dp)) {
+                        benefits.forEach { benefit ->
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 12.dp, vertical = 4.dp),
+                                verticalAlignment = Alignment.CenterVertically,
                             ) {
-                                Box(contentAlignment = Alignment.Center) {
-                                    Icon(
-                                        imageVector = benefit.icon,
-                                        contentDescription = null,
-                                        tint = MaterialTheme.colorScheme.onPrimaryContainer,
-                                        modifier = Modifier.size(16.dp),
-                                    )
+                                Surface(
+                                    shape = RoundedCornerShape(8.dp),
+                                    color = MaterialTheme.colorScheme.primaryContainer,
+                                    modifier = Modifier.size(28.dp),
+                                ) {
+                                    Box(contentAlignment = Alignment.Center) {
+                                        Icon(
+                                            imageVector = benefit.icon,
+                                            contentDescription = null,
+                                            tint = MaterialTheme.colorScheme.onPrimaryContainer,
+                                            modifier = Modifier.size(16.dp),
+                                        )
+                                    }
                                 }
+                                Spacer(modifier = Modifier.width(12.dp))
+                                Text(
+                                    text = stringResource(benefit.textRes),
+                                    style = MaterialTheme.typography.bodyLarge,
+                                )
                             }
-                            Spacer(modifier = Modifier.width(12.dp))
-                            Text(
-                                text = stringResource(benefit.textRes),
-                                style = MaterialTheme.typography.bodyLarge,
-                            )
                         }
                     }
                 }
+
+                Text(
+                    text = stringResource(R.string.upgrade_benefit_disclaimer),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(top = 8.dp),
+                )
+
+                Spacer(modifier = Modifier.height(24.dp))
+
+                if (state == null) {
+                    CircularProgressIndicator(modifier = Modifier.padding(16.dp))
+                } else {
+                    PricingContent(
+                        state = state,
+                        onSubscription = onSubscription,
+                        onSubscriptionTrial = onSubscriptionTrial,
+                        onIap = onIap,
+                        onRestore = onRestore,
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(24.dp))
             }
 
-            Spacer(modifier = Modifier.height(24.dp))
-
-            if (state == null) {
-                CircularProgressIndicator(modifier = Modifier.padding(16.dp))
-            } else {
-                PricingContent(
-                    state = state,
-                    onSubscription = onSubscription,
-                    onSubscriptionTrial = onSubscriptionTrial,
-                    onIap = onIap,
-                    onRestore = onRestore,
+            IconButton(
+                onClick = onNavigateUp,
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .padding(4.dp),
+            ) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
+                    contentDescription = null,
                 )
             }
-
-            Spacer(modifier = Modifier.height(24.dp))
-        }
-
-        IconButton(
-            onClick = onNavigateUp,
-            modifier = Modifier.padding(4.dp),
-        ) {
-            Icon(
-                imageVector = Icons.AutoMirrored.TwoTone.ArrowBack,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.onSurface,
-            )
         }
     }
 }