Release: 3.1.0-rc0

Pull latest string translations from Crowdin.
Validated and reverted any problematic changes.

.claude/CLAUDE.md

@@ -0,0 +1,45 @@
+# CAPod - Companion for AirPods
+
+Android app that detects and monitors AirPods via Bluetooth LE. Displays battery levels, triggers popup notifications on case open, and provides home screen widgets.
+
+## Project Structure
+
+| Module | Description |
+|--------|-------------|
+| `app/` | Main Android app (FOSS and Google Play flavors) |
+| `app-common/` | Shared code between phone and Wear OS apps |
+
+## Build Flavors
+
+- **FOSS** (`foss`): Open-source, no Google Play dependencies
+- **Google Play** (`gplay`): Includes billing client for IAP
+
+Quick build check: `./gradlew assembleFossDebug`
+
+## Key Locations
+
+| 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/res/` | Layouts, drawables, strings |
+| `app-common/src/test/` | Unit tests |
+| `app/build.gradle.kts` | App build config, dependencies, flavors |
+
+## 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
+
+## Rules Reference
+
+Detailed guidelines are in `.claude/rules/`:
+
+- `architecture.md` — Module structure, key components, data flow, dependencies
+- `build-commands.md` — Build, test, lint, and release commands
+- `localization.md` — String resource naming conventions
+- `commit-guidelines.md` — Commit message format and prefixes
+- `agent-instructions.md` — Sub-agent delegation and critical thinking

.claude/rules/agent-instructions.md

@@ -0,0 +1,39 @@
+---
+description: Instructions for Claude Code sub-agents and task delegation
+globs:
+  - "**"
+---
+
+# Agent Instructions
+
+## Critical Thinking
+
+- Do not blindly accept information at face value
+- Verify assumptions against actual code before proceeding
+- When encountering unexpected behavior, investigate root causes rather than applying workarounds
+- If something seems wrong, it probably is — dig deeper
+
+## Explore vs. Implement
+
+- **Explore first**: Before making changes, understand the existing code structure and patterns
+- **Read before writing**: Always read relevant files before modifying them
+- **Follow existing patterns**: Match the code style and architecture already in use
+- **Minimal changes**: Only change what's necessary to accomplish the task
+
+## Sub-Agent Delegation
+
+When using Task tool to spawn sub-agents:
+
+- Provide complete context — sub-agents don't share your conversation history unless noted
+- Be specific about what you need: research only, or research + implementation
+- Use `Explore` agent type for codebase investigation
+- Use `Bash` agent type for running builds and tests
+- Parallelize independent sub-agent tasks for efficiency
+
+## Common Pitfalls
+
+- Don't create new files when editing existing ones would suffice
+- Don't add features beyond what was requested
+- Don't refactor surrounding code when fixing a bug
+- Don't add comments or documentation to code you didn't change
+- Don't guess at file paths — use Glob/Grep to find them

.claude/rules/architecture.md

@@ -0,0 +1,84 @@
+---
+description: Architecture overview, module structure, key components, data flow, and dependencies
+globs:
+  - "app/**/*.kt"
+  - "app-common/**/*.kt"
+  - "**/*.gradle.kts"
+---
+
+# Architecture
+
+## Multi-Module Structure
+
+- **app/**: Main Android application with FOSS and Google Play flavors
+- **app-common/**: Shared code between main app and Wear OS app
+
+## Core Patterns
+
+- **MVVM**: ViewModels with LiveData/StateFlow for UI state management
+- **Dependency Injection**: Hilt/Dagger for dependency management
+- **Coroutines**: Kotlin coroutines for async operations
+- **Repository Pattern**: Data layer abstraction for monitoring and settings
+
+## Key Components
+
+### PodMonitor System
+
+- `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
+
+### Reaction System
+
+- `ReactionSettingsFragment`: Configuration for popup notifications
+- `PopUpWindow`: Displays AirPods status when case is opened
+- `PopUpPodViewFactory`: Creates UI components for different pod models
+
+### Common Utilities
+
+- `EdgeToEdgeHelper`: Handles Android edge-to-edge display insets
+
+## Build Configuration
+
+### Flavors
+
+- **FOSS**: Open-source version without Google Play dependencies
+- **Google Play (gplay)**: Version with billing client for in-app purchases
+
+### Build Types
+
+- **debug**: Unobfuscated, full logging, no minification
+- **beta**: Obfuscated, production-ready with strict lint checks
+- **release**: Fully optimized for production distribution
+
+## 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.
+
+## Testing Strategy
+
+- **Unit Tests**: Located in `app-common/src/test/` for shared logic
+- **Test Flavors**: Separate test configurations for FOSS and Google Play variants
+
+## Key Dependencies
+
+- **Hilt**: Dependency injection framework
+- **AndroidX Navigation**: Fragment navigation with SafeArgs
+- **Moshi**: JSON serialization for configuration and debugging
+- **Material Design**: UI components following Material Design guidelines

.claude/rules/build-commands.md

@@ -0,0 +1,71 @@
+---
+description: Build, test, lint, and release commands for Gradle
+globs:
+  - "**/*.gradle.kts"
+  - "**/*.gradle"
+  - "gradle/**"
+---
+
+# Build Commands
+
+## Build
+
+```bash
+# Build debug version
+./gradlew assembleDebug
+
+# Build all variants (FOSS and Google Play flavors)
+./gradlew assemble
+
+# Build specific flavor and type
+./gradlew assembleFossDebug
+./gradlew assembleGplayRelease
+
+# Build app bundles for Play Store
+./gradlew bundleGplayRelease
+```
+
+## Testing
+
+```bash
+# Run all unit tests
+./gradlew test
+
+# Run unit tests for specific variant
+./gradlew testFossDebugUnitTest
+
+# Run instrumentation tests (requires connected device/emulator)
+./gradlew connectedAndroidTest
+./gradlew connectedFossDebugAndroidTest
+
+# Run all checks (lint + tests)
+./gradlew check
+```
+
+## Code Quality
+
+```bash
+# Run lint for all variants
+./gradlew lint
+
+# Run lint for specific variant
+./gradlew lintFossDebug
+
+# Auto-fix lint issues where possible
+./gradlew lintFix
+
+# Update lint baseline
+./gradlew updateLintBaseline
+```
+
+## Release
+
+```bash
+./gradlew assembleFossRelease assembleGplayRelease
+```
+
+## Notes
+
+- Use `assembleFossDebug` as the default quick-check build (fastest variant)
+- Run `./gradlew check` before submitting changes to catch lint and test issues
+- Instrumentation tests require a connected device or running emulator

.claude/rules/commit-guidelines.md

@@ -0,0 +1,41 @@
+---
+description: Git commit message format and conventions
+globs:
+  - "**"
+---
+
+# Commit Guidelines
+
+## Format
+
+```
+<prefix>: <Short summary>
+```
+
+Summary line should be concise and describe the change. No period at the end.
+
+## Prefixes
+
+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
+- **chore**: Maintenance, dependency updates, build config
+- **docs**: Documentation changes
+
+## Component Scope (optional)
+
+When a change is scoped to a specific area, include it after the prefix:
+
+- `fix(widget): Fix layout for devices with single charge detection`
+- `feat(monitor): Add battery level caching`
+- `refactor(popup): Extract pod view factory`
+
+## Rules
+
+- Keep the summary line under 72 characters
+- Use imperative mood ("Add feature" not "Added feature")
+- Reference issue numbers when applicable
+- Do not include `Co-authored-by` trailers
+- Look at recent `git log` output to match the project's existing style

.claude/rules/localization.md

@@ -0,0 +1,21 @@
+---
+description: Guidelines for adding and naming Android string resources
+globs:
+  - "**/res/values*/strings.xml"
+---
+
+# Localization Guidelines
+
+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`)
+- **Provide context**: String names should indicate usage and location
+- **Consider pluralization**: Use Android plural resources (`<plurals>`) when quantities vary
+
+## Naming Examples
+
+- `profiles_create_title` (screen title)
+- `profiles_name_label` (form field label)
+- `profiles_delete_confirmation` (dialog message)
+- `error_network_unavailable` (error message)

.claude/settings.json

@@ -2,12 +2,6 @@
   "permissions": {
 	"allow": [
 	  "mcp__ide__getDiagnostics",
-	  "Bash(./gradlew tasks:*)",
-	  "Bash(./gradlew:*)",
-	  "Bash(find:*)",
-	  "Bash(ls:*)",
-	  "Bash(grep:*)",
-	  "Bash(rg:*)",
 	  "WebSearch",
 	  "WebFetch(domain:support.google.com)",
 	  "WebFetch(domain:github.com)",
@@ -17,5 +11,10 @@
 	  "WebFetch(domain:issuetracker.google.com)"
 	],
 	"deny": []
+  },
+  "enabledPlugins": {
+	"android-translation@claude-code-cafe": true,
+	"debugbadger@claude-code-cafe": true,
+	"jvm-tools@claude-code-cafe": true
   }
 }

.claude/tmp/fix_imports.py

@@ -1,59 +0,0 @@
-#!/usr/bin/env python3
-"""
-Script to fix import statements after removing app-common module.
-This script fixes R class imports from app-common to app module.
-"""
-
-import os
-import re
-from pathlib import Path
-
-def fix_r_import(file_path):
-    """Fix R import in a single file."""
-    print(f"Fixing R import in: {file_path}")
-    
-    with open(file_path, 'r', encoding='utf-8') as f:
-        content = f.read()
-    
-    # Replace the import statement
-    updated_content = re.sub(
-        r'import eu\.darken\.capod\.common\.R$',
-        'import eu.darken.capod.R',
-        content,
-        flags=re.MULTILINE
-    )
-    
-    if updated_content != content:
-        with open(file_path, 'w', encoding='utf-8') as f:
-            f.write(updated_content)
-        print(f"  ✓ Updated import in {file_path}")
-        return True
-    else:
-        print(f"  - No changes needed in {file_path}")
-        return False
-
-def main():
-    """Main function to fix all import statements."""
-    project_root = Path.cwd()
-    app_src = project_root / "app" / "src"
-    
-    # Find all Kotlin files that import eu.darken.capod.common.R
-    files_to_fix = []
-    for kt_file in app_src.rglob("*.kt"):
-        with open(kt_file, 'r', encoding='utf-8') as f:
-            content = f.read()
-            if re.search(r'import eu\.darken\.capod\.common\.R$', content, re.MULTILINE):
-                files_to_fix.append(kt_file)
-    
-    print(f"Found {len(files_to_fix)} files with incorrect R imports")
-    
-    success_count = 0
-    for file_path in files_to_fix:
-        if fix_r_import(file_path):
-            success_count += 1
-    
-    print(f"\nFixed imports in {success_count} files")
-    return 0
-
-if __name__ == "__main__":
-    exit(main())

.claude/tmp/fix_qualified_r_references.py

@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-"""
-Script to fix fully qualified R references in code.
-This script finds and replaces eu.darken.capod.common.R with R.
-"""
-
-import os
-import re
-from pathlib import Path
-
-def fix_qualified_r_references(file_path):
-    """Fix fully qualified R references in a single file."""
-    print(f"Fixing qualified R references in: {file_path}")
-    
-    with open(file_path, 'r', encoding='utf-8') as f:
-        content = f.read()
-    
-    # Replace fully qualified references
-    updated_content = re.sub(
-        r'\beu\.darken\.capod\.common\.R\.',
-        'R.',
-        content
-    )
-    
-    if updated_content != content:
-        with open(file_path, 'w', encoding='utf-8') as f:
-            f.write(updated_content)
-        print(f"  ✓ Fixed qualified R references in {file_path}")
-        return True
-    else:
-        print(f"  - No changes needed in {file_path}")
-        return False
-
-def main():
-    """Main function to fix all qualified R references."""
-    project_root = Path.cwd()
-    app_src = project_root / "app" / "src"
-    
-    # Find all Kotlin files that have qualified R references
-    files_to_fix = []
-    for kt_file in app_src.rglob("*.kt"):
-        with open(kt_file, 'r', encoding='utf-8') as f:
-            content = f.read()
-            if re.search(r'\beu\.darken\.capod\.common\.R\.', content):
-                files_to_fix.append(kt_file)
-    
-    print(f"Found {len(files_to_fix)} files with qualified R references")
-    
-    success_count = 0
-    for file_path in files_to_fix:
-        if fix_qualified_r_references(file_path):
-            success_count += 1
-    
-    print(f"\nFixed qualified R references in {success_count} files")
-    return 0
-
-if __name__ == "__main__":
-    exit(main())

.claude/tmp/fix_remaining_r_imports.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-"""
-Script to fix remaining R import issues.
-This script finds files that use R.* but don't have R imports and adds them.
-"""
-
-import os
-import re
-from pathlib import Path
-
-def needs_r_import(file_path):
-    """Check if file uses R.* but doesn't import R."""
-    with open(file_path, 'r', encoding='utf-8') as f:
-        content = f.read()
-    
-    # Check if file uses R.something
-    uses_r = re.search(r'\bR\.[a-zA-Z_]', content)
-    if not uses_r:
-        return False
-    
-    # Check if file already imports R
-    has_import = re.search(r'import.*\.R$', content, re.MULTILINE)
-    if has_import:
-        return False
-    
-    return True
-
-def add_r_import(file_path):
-    """Add R import to a file."""
-    print(f"Adding R import to: {file_path}")
-    
-    with open(file_path, 'r', encoding='utf-8') as f:
-        content = f.read()
-    
-    # Find the package line
-    package_match = re.search(r'^package\s+[^\n]+$', content, re.MULTILINE)
-    if not package_match:
-        print(f"  Error: No package declaration found in {file_path}")
-        return False
-    
-    # Find existing imports
-    import_pattern = r'^import\s+[^\n]+$'
-    existing_imports = list(re.finditer(import_pattern, content, re.MULTILINE))
-    
-    if existing_imports:
-        # Insert after the last import
-        last_import = existing_imports[-1]
-        insert_pos = last_import.end()
-        updated_content = (content[:insert_pos] + 
-                         "\nimport eu.darken.capod.R" + 
-                         content[insert_pos:])
-    else:
-        # Insert after package line
-        insert_pos = package_match.end()
-        updated_content = (content[:insert_pos] + 
-                         "\n\nimport eu.darken.capod.R" + 
-                         content[insert_pos:])
-    
-    with open(file_path, 'w', encoding='utf-8') as f:
-        f.write(updated_content)
-    
-    print(f"  ✓ Added R import to {file_path}")
-    return True
-
-def main():
-    """Main function to fix all R import issues."""
-    project_root = Path.cwd()
-    app_src = project_root / "app" / "src"
-    
-    # Find all Kotlin files that need R import
-    files_to_fix = []
-    for kt_file in app_src.rglob("*.kt"):
-        if needs_r_import(kt_file):
-            files_to_fix.append(kt_file)
-    
-    print(f"Found {len(files_to_fix)} files that need R imports")
-    
-    success_count = 0
-    for file_path in files_to_fix:
-        if add_r_import(file_path):
-            success_count += 1
-    
-    print(f"\nAdded R imports to {success_count} files")
-    return 0
-
-if __name__ == "__main__":
-    exit(main())

.claude/tmp/merge_strings.py

@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""
-Script to merge strings.xml files from app-common module to app module.
-This script merges all string entries from app-common into the corresponding app module files.
-"""
-
-import os
-import re
-import xml.etree.ElementTree as ET
-from pathlib import Path
-
-def merge_strings_xml(app_common_file, app_file):
-    """Merge strings from app-common file into app file."""
-    print(f"Processing: {app_common_file.name} -> {app_file.name}")
-    
-    # Read the app-common strings.xml content
-    with open(app_common_file, 'r', encoding='utf-8') as f:
-        common_content = f.read()
-    
-    # Read the app strings.xml content
-    with open(app_file, 'r', encoding='utf-8') as f:
-        app_content = f.read()
-    
-    # Extract string entries from app-common (including comments)
-    # Find everything between <resources> and </resources> tags, excluding the tags themselves
-    common_match = re.search(r'<resources[^>]*>(.*?)</resources>', common_content, re.DOTALL)
-    if not common_match:
-        print(f"  Warning: No resources found in {app_common_file}")
-        return False
-    
-    common_strings = common_match.group(1).strip()
-    
-    if not common_strings:
-        print(f"  Warning: No string content found in {app_common_file}")
-        return False
-    
-    # Find the insertion point in the app file (before </resources>)
-    app_match = re.search(r'(.*?)(\s*</resources>)', app_content, re.DOTALL)
-    if not app_match:
-        print(f"  Error: Invalid XML structure in {app_file}")
-        return False
-    
-    # Merge the content
-    before_closing = app_match.group(1)
-    closing_tag = app_match.group(2)
-    
-    # Add the common strings with proper spacing
-    merged_content = f"{before_closing}\n\n    <!-- Strings from app-common -->\n{common_strings}\n{closing_tag}"
-    
-    # Write the merged content back to the app file
-    with open(app_file, 'w', encoding='utf-8') as f:
-        f.write(merged_content)
-    
-    print(f"  ✓ Merged successfully")
-    return True
-
-def main():
-    """Main function to merge all strings.xml files."""
-    project_root = Path.cwd()
-    app_common_res = project_root / "app-common" / "src" / "main" / "res"
-    app_res = project_root / "app" / "src" / "main" / "res"
-    
-    if not app_common_res.exists():
-        print(f"Error: app-common resources directory not found: {app_common_res}")
-        return 1
-    
-    if not app_res.exists():
-        print(f"Error: app resources directory not found: {app_res}")
-        return 1
-    
-    # Find all strings.xml files in app-common
-    common_strings_files = list(app_common_res.glob("*/strings.xml"))
-    
-    if not common_strings_files:
-        print("Error: No strings.xml files found in app-common")
-        return 1
-    
-    print(f"Found {len(common_strings_files)} strings.xml files to merge")
-    
-    success_count = 0
-    error_count = 0
-    
-    for common_file in sorted(common_strings_files):
-        # Determine the corresponding app file
-        locale_dir = common_file.parent.name
-        app_file = app_res / locale_dir / "strings.xml"
-        
-        if not app_file.exists():
-            print(f"  Error: Corresponding app file does not exist: {app_file}")
-            error_count += 1
-            continue
-        
-        if merge_strings_xml(common_file, app_file):
-            success_count += 1
-        else:
-            error_count += 1
-    
-    print(f"\nMerge complete:")
-    print(f"  ✓ Successfully merged: {success_count}")
-    print(f"  ✗ Errors: {error_count}")
-    
-    return 0 if error_count == 0 else 1
-
-if __name__ == "__main__":
-    exit(main())

.github/workflows/code-checks.yml

@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [ Debug,Beta,Release ]
+        variant: [ Debug ]
         flavor: [ testFoss,testGplay ]
     runs-on: ubuntu-22.04
     steps:

.github/workflows/release-tag.yml

@@ -65,7 +65,7 @@ jobs:
           tag_name: ${{ steps.tagger.outputs.tag }}
           name: ${{ steps.tagger.outputs.tag }}
           generate_release_notes: true
-          files: app/build/outputs/apk/foss/beta/*.apk
+          files: app/build/outputs/apk/foss/beta/eu.darken.capod-*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -77,7 +77,7 @@ jobs:
           tag_name: ${{ steps.tagger.outputs.tag }}
           name: ${{ steps.tagger.outputs.tag }}
           generate_release_notes: true
-          files: app/build/outputs/apk/foss/release/*.apk
+          files: app/build/outputs/apk/foss/release/eu.darken.capod-*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

CLAUDE.md

@@ -1,158 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Commands
-
-### Build Commands
-
-```bash
-# Build debug version
-./gradlew assembleDebug
-
-# Build all variants (FOSS and Google Play flavors)
-./gradlew assemble
-
-# Build specific flavor and type
-./gradlew assembleFossDebug
-./gradlew assembleGplayRelease
-
-# Build app bundles for Play Store
-./gradlew bundleGplayRelease
-```
-
-### Testing Commands
-
-```bash
-# Run all unit tests
-./gradlew test
-
-# Run unit tests for specific variant
-./gradlew testFossDebugUnitTest
-
-# Run instrumentation tests (requires connected device/emulator)
-./gradlew connectedAndroidTest
-./gradlew connectedFossDebugAndroidTest
-
-# Run all checks (lint + tests)
-./gradlew check
-```
-
-### Code Quality Commands
-
-```bash
-# Run lint for all variants
-./gradlew lint
-
-# Run lint for specific variant
-./gradlew lintFossDebug
-
-# Auto-fix lint issues where possible
-./gradlew lintFix
-
-# Update lint baseline
-./gradlew updateLintBaseline
-```
-
-### Release Commands
-
-```bash
-./gradlew assembleFossRelease assembleGplayRelease
-```
-
-## Architecture Overview
-
-### Multi-Module Structure
-
-- **app/**: Main Android application with FOSS and Google Play flavors
-- **app-common/**: Shared code between main app
-
-### Core Architecture Patterns
-
-- **MVVM**: ViewModels with LiveData/StateFlow for UI state management
-- **Dependency Injection**: Hilt/Dagger for dependency management
-- **Coroutines**: Extensive use of Kotlin coroutines for async operations
-- **Repository Pattern**: Data layer abstraction for monitoring and settings
-
-### Key Components
-
-#### PodMonitor System
-
-- `PodMonitor`: Core service that detects and tracks AirPods via Bluetooth LE
-- `MonitorControl`: Manages background monitoring worker lifecycle
-- `MonitorWorker`: Background worker that continuously scans for AirPods
-- `BluetoothEventReceiver`: Handles system Bluetooth events
-
-#### Reaction System
-
-- `ReactionSettingsFragment`: Configuration for popup notifications
-- `PopUpWindow`: Displays AirPods status when case is opened
-- `PopUpPodViewFactory`: Creates UI components for different pod models
-
-#### Common Utilities
-
-- `EdgeToEdgeHelper`: Handles Android edge-to-edge display insets
-
-### Build Configuration
-
-#### Flavors
-
-- **FOSS**: Open-source version without Google Play dependencies
-- **Google Play**: Version with billing client for in-app purchases
-
-#### Build Types
-
-- **debug**: Unobfuscated, full logging, no minification
-- **beta**: Obfuscated, production-ready with strict lint checks
-- **release**: Fully optimized for production distribution
-
-### Data Flow Architecture
-
-The app follows a unidirectional data flow:
-
-1. `BluetoothEventReceiver` detects Bluetooth events
-2. `MonitorWorker` 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
-
-### Testing Strategy
-
-- **Unit Tests**: Located in `app-common/src/test/` for shared logic
-- **Test Flavors**: Separate test configurations for FOSS and Google Play variants
-
-### Key Dependencies
-
-- **Hilt**: Dependency injection framework
-- **AndroidX Navigation**: Fragment navigation with SafeArgs
-- **WorkManager**: Background task scheduling for monitoring
-- **Moshi**: JSON serialization for configuration and debugging
-- **Material Design**: UI components following Material Design guidelines
-
-## Development Notes
-
-### Bluetooth LE Implementation
-
-The app uses Android's Bluetooth LE APIs to scan for Apple device advertisements. The core scanning logic is in
-`MonitorWorker` which runs as a long-lived background task.
-
-### 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.
-
-### Localization Guidelines
-
-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`)
-- **Provide context**: String names should indicate usage and location
-- **Consider pluralization**: Use Android plural resources (`<plurals>`) when quantities vary
-
-Examples of correct string naming:
-- `profiles_create_title` (screen title)
-- `profiles_name_label` (form field label)  
-- `profiles_delete_confirmation` (dialog message)
-- `error_network_unavailable` (error message)

Gemfile.lock

@@ -1,48 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1109.0)
-    aws-sdk-core (3.224.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1216.0)
+    aws-sdk-core (3.242.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.101.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-kms (1.122.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.188.0)
-      aws-sdk-core (~> 3, >= 3.224.1)
+    aws-sdk-s3 (1.213.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.3.0)
+    base64 (0.2.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.109.0)
-    faraday (1.10.4)
+    excon (0.112.0)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -54,14 +55,14 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -71,15 +72,19 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.228.0)
+    fastlane (2.232.1)
       CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
+      base64 (~> 0.2.0)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.0.0)
       colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -91,16 +96,20 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
       naturally (~> 2.2)
+      nkf (~> 0.2.0)
       optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.5)
@@ -116,38 +125,40 @@ GEM
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-androidpublisher_v3 (0.96.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.29.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-apis-iamcredentials_v1 (0.26.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.60.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.45.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.58.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -158,37 +169,38 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.7.6)
-    jwt (2.10.1)
+    json (2.18.1)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
+    multi_json (1.19.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.3.0)
     nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.8.1)
     os (1.1.4)
+    ostruct (0.6.3)
     plist (3.7.2)
-    public_suffix (5.1.1)
-    rake (13.3.0)
+    public_suffix (7.0.2)
+    rake (13.3.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.4.1)
+    retriable (3.2.0)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.18.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
@@ -203,7 +215,6 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.2.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcodeproj (1.27.0)

README.md

@@ -3,6 +3,7 @@
 # Companion App for AirPods (CAPod)
 
 [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases)](https://github.com/d4rken-org/capod/releases/latest)
+[![RB Status](https://shields.rbtlog.dev/simple/eu.darken.capod)](https://shields.rbtlog.dev/eu.darken.capod)
 [![Code tests & eval](https://github.com/d4rken-org/capod/actions/workflows/code-checks.yml/badge.svg)](https://github.com/d4rken/capod/actions/workflows/code-checks.yml)
 [![Crowdin](https://badges.crowdin.net/capod/localized.svg)](https://crowdin.com/project/capod)
 [![Github Downloads](https://img.shields.io/github/downloads/d4rken-org/capod/total.svg?label=GitHub%20Downloads&logo=github)](https://github.com/d4rken-org/capod/edit/main/README.md#download)

VERSION

@@ -1 +1 @@
-3.0.1-rc0 30001000
+3.1.0-rc0 30100000

_config.yml

@@ -26,4 +26,3 @@ exclude:
   - app
   - app-common
   - CONTRIBUTING.md
-  - CLAUDE.md

app/build.gradle.kts

@@ -35,7 +35,7 @@ android {
     }
 
     signingConfigs {
-        val basePath = File(System.getProperty("user.home"), ".appconfig/${projectConfig.packageName}")
+        val basePath = File(System.getProperty("user.home"), ".config/projects/${projectConfig.packageName}")
         create("releaseFoss") {
             setupCredentials(File(basePath, "signing-foss.properties"))
         }
@@ -94,21 +94,9 @@ android {
         }
     }
 
-    buildOutputs.all {
-        val variantOutputImpl = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
-        val variantName: String = variantOutputImpl.name
-
-        if (listOf("release", "beta").any { variantName.lowercase().contains(it) }) {
-            val outputFileName = projectConfig.packageName +
-                    "-v${defaultConfig.versionName}-${defaultConfig.versionCode}" +
-                    "-${variantName.uppercase()}.apk"
-
-            variantOutputImpl.outputFileName = outputFileName
-        }
-    }
-
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
 
     compileOptions {
@@ -141,6 +129,42 @@ android {
     }
 }
 
+androidComponents {
+    onVariants { variant ->
+        val buildType = variant.buildType ?: return@onVariants
+        if (buildType != "release" && buildType != "beta") return@onVariants
+
+        val formattedVariantName = variant.name
+            .replace(Regex("([a-z])([A-Z])"), "$1-$2")
+            .uppercase()
+
+        val apkFolder = variant.artifacts.get(com.android.build.api.artifact.SingleArtifact.APK)
+        val loader = variant.artifacts.getBuiltArtifactsLoader()
+        val packageName = projectConfig.packageName
+
+        val renameTask = tasks.register("rename${variant.name.replaceFirstChar { it.uppercase() }}Apk") {
+            inputs.files(apkFolder)
+            outputs.upToDateWhen { false }
+
+            doLast {
+                val builtArtifacts = loader.load(apkFolder.get()) ?: return@doLast
+
+                builtArtifacts.elements.forEach { element ->
+                    val apkFile = File(element.outputFile)
+                    val outputFileName = "$packageName-v${element.versionName}-${element.versionCode}-$formattedVariantName.apk"
+                    if (apkFile.exists() && apkFile.name != outputFileName) {
+                        apkFile.copyTo(File(apkFile.parentFile, outputFileName), overwrite = true)
+                    }
+                }
+            }
+        }
+
+        tasks.matching { it.name == "assemble${variant.name.replaceFirstChar { it.uppercase() }}" }.configureEach {
+            finalizedBy(renameTask)
+        }
+    }
+}
+
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 
@@ -158,7 +182,6 @@ dependencies {
     implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
 
     addNavigation()
-    addBaseWorkManager()
 
     addTesting()
 

app/proguard/proguard-rules.pro

@@ -1,23 +1,2 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
+-keep class eu.darken.capod.BuildConfig { *; }
 -dontobfuscate

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="foss_upgrade_donate_label">Wsparcie</string>
-    <string name="foss_upgrade_alreadydonated_label">Już się zrzuciłem</string>
+    <string name="foss_upgrade_donate_label">Wesprzyj</string>
+    <string name="foss_upgrade_alreadydonated_label">Już wsparłem</string>
     <string name="foss_upgrade_no_money_label">Wydałem wszystkie pieniądze na AirPods</string>
 </resources>

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

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="foss_upgrade_donate_label">Donar</string>
+    <string name="foss_upgrade_alreadydonated_label">Hai gia donat</string>
+    <string name="foss_upgrade_no_money_label">Mett tut mes daners en AirPods</string>
+</resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play-dienste is nie beskikbaar nie.</string>
     <string name="upgrades_no_purchases_found_check_account">Geen aankope gevind nie. Gebruik jy die regte rekening?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-fout</string>
+    <string name="upgrades_gplay_billing_error_description">Daar was \'n fout in Google Play. Probeer asseblief later weer of herbegin jou foon.\n\nFout: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play-faktureringsfout</string>
+    <string name="upgrades_gplay_billing_result_error_description">Daar was \'n fout toe Google Play om jou aankoopbesonderhede gevra is. Maak die Google Play-kas skoon en herbegin jou foon.\n\nFout %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">የGoogle Play አገልግሎቶች አይገኙም።</string>
     <string name="upgrades_no_purchases_found_check_account">ምንም ግዢዎች አልተገኙም። ትክክለኛውን መለያ እየተጠቀሙ ነው?</string>
+    <string name="upgrades_gplay_billing_error_label">የGoogle Play ስህተት</string>
+    <string name="upgrades_gplay_billing_error_description">በGoogle Play ላይ ስህተት ነበር። እባክዎ ቆይተው ይሞክሩ ወይም ስልክዎን እንደገና ያስጀምሩ።\n\nስህተት: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">የGoogle Play ክፍያ ስህተት</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play የግዢ ዝርዝሮችዎን ሲጠይቅ ስህተት ነበር። የGoogle Play መሸጎጫውን ያጽዱ እና ስልክዎን እንደገና ያስጀምሩ።\n\nስህተት %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">خدمات Google Play غير متاحة.</string>
     <string name="upgrades_no_purchases_found_check_account">لم يتم العثور على أي مشتريات. هل تستخدم الحساب الصحيح؟</string>
+    <string name="upgrades_gplay_billing_error_label">خطأ في Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">حدث خطأ في Google Play. يرجى المحاولة مرة أخرى لاحقًا أو إعادة تشغيل هاتفك.\n\nخطأ: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">خطأ في فوترة Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">حدث خطأ عند طلب تفاصيل الشراء من Google Play. امسح ذاكرة التخزين المؤقت لـ Google Play وأعد تشغيل هاتفك.\n\nخطأ %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play xidmətləri əlçatmazdır.</string>
     <string name="upgrades_no_purchases_found_check_account">Heç bir satın alma tapılmadı. Doğru hesabı istifadə edirsiniz?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play xətası</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-də xəta baş verdi. Zəhmət olmasa daha sonra yenidən cəhd edin və ya telefonunuzu yenidən başladın.\n\nXəta: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play faktura xətası</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play-dən satınalma təfərrüatlarınızı soruşarkən xəta baş verdi. Google Play keşini təmizləyin və telefonunuzu yenidən başladın.\n\nXəta %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Службы Google Play недаступныя.</string>
     <string name="upgrades_no_purchases_found_check_account">Пакупак не знойдзена. Вы выкарыстоўваеце правільны ўліковы запіс?</string>
+    <string name="upgrades_gplay_billing_error_label">Памылка Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Адбылася памылка ў Google Play. Калі ласка, паспрабуйце пазней або перазагрузіце тэлефон.\n\nПамылка: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Памылка выстаўлення рахункаў Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Адбылася памылка пры запыце дэталяў пакупкі ў Google Play. Ачысціце кэш Google Play і перазагрузіце тэлефон.\n\nПамылка %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Услугите на Google Play не са налични.</string>
     <string name="upgrades_no_purchases_found_check_account">Няма намерени покупки. Правилния акаунт ли използвате?</string>
+    <string name="upgrades_gplay_billing_error_label">Грешка в Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Възникна грешка в Google Play. Моля, опитайте отново по-късно или рестартирайте телефона си.\n\nГрешка: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Грешка при фактуриране в Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Възникна грешка при заявката за данни за покупката ви от Google Play. Изчистете кеша на Google Play и рестартирайте телефона си.\n\nГрешка %s</string>
 </resources>

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

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play পরিষেবাগুলি উপলব্ধ নেই৷</string>
-    <string name="upgrades_no_purchases_found_check_account">কোনও কেনাকাটা খুঁজে পাওয়া যায়নি। আপনি কি সঠিক অ্যাকাউন্ট ব্যবহার করছেন?</string>
+    <string name="upgrades_no_purchases_found_check_account">কোনও কেনাকাটা খুঁজে পাওয়া যায়নি। আপনি কি সঠিক অ্যাকাউন্ট ব্যবহার করছেন?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play ত্রুটি</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-তে একটি ত্রুটি হয়েছে। অনুগ্রহ করে পরে আবার চেষ্টা করুন অথবা আপনার ফোন রিবুট করুন।\n\nত্রুটি: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play বিলিং ত্রুটি</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play-তে আপনার কেনাকাটার বিবরণ জানতে চাইলে একটি ত্রুটি হয়েছে। Google Play ক্যাশে সাফ করুন এবং আপনার ফোন রিবুট করুন।\n\nত্রুটি %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play-tjenester er ikke tilgængelige.</string>
     <string name="upgrades_no_purchases_found_check_account">Ingen køb fundet. Bruger du den rigtige konto?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-fejl</string>
+    <string name="upgrades_gplay_billing_error_description">Der opstod en fejl i Google Play. Prøv venligst igen senere, eller genstart din telefon.\n\nFejl: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play-faktureringsfejl</string>
+    <string name="upgrades_gplay_billing_result_error_description">Der opstod en fejl under forespørgsel af dine købsoplysninger fra Google Play. Ryd Google Play-cachen, og genstart din telefon.\n\nFejl %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Οι υπηρεσίες Google Play δεν είναι διαθέσιμες.</string>
     <string name="upgrades_no_purchases_found_check_account">Δε βρέθηκαν αγορές. Χρησιμοποιείτε τον σωστό λογαριασμό;</string>
+    <string name="upgrades_gplay_billing_error_label">Σφάλμα Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Παρουσιάστηκε σφάλμα στο Google Play. Παρακαλώ προσπαθήστε ξανά αργότερα ή επανεκκινήστε το τηλέφωνό σας.\n\nΣφάλμα: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Σφάλμα χρέωσης Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Παρουσιάστηκε σφάλμα κατά την αίτηση των στοιχείων αγοράς σας από το Google Play. Εκκαθαρίστε την προσωρινή μνήμη του Google Play και επανεκκινήστε το τηλέφωνό σας.\n\nΣφάλμα %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play zerbitzuak ez daude erabilgarri.</string>
     <string name="upgrades_no_purchases_found_check_account">Ez da erosketarik aurkitu. Kontu egokia erabiltzen ari zara?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play errorea</string>
+    <string name="upgrades_gplay_billing_error_description">Errore bat gertatu da Google Play-n. Mesedez, saiatu berriro geroago edo berrabiarazi telefonoa.\n\nErrorea: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play fakturazio errorea</string>
+    <string name="upgrades_gplay_billing_result_error_description">Errore bat gertatu da Google Play-ri zure erosketa xehetasunak eskatzean. Garbitu Google Play-ren cachea eta berrabiarazi telefonoa.\n\nErrorea %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">سرویس‌های Google Play در دسترس نیستند.</string>
     <string name="upgrades_no_purchases_found_check_account">خریدی یافت نشد. آیا از حساب درستی استفاده می‌کنید؟</string>
+    <string name="upgrades_gplay_billing_error_label">خطای Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">خطایی در Google Play رخ داد. لطفاً بعداً دوباره امتحان کنید یا گوشی خود را مجدداً راه‌اندازی کنید.\n\nخطا: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">خطای صورت‌حساب Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">هنگام درخواست جزئیات خرید از Google Play خطایی رخ داد. حافظه پنهان Google Play را پاک کنید و گوشی خود را مجدداً راه‌اندازی کنید.\n\nخطا %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play -palvelut eivät ole käytettävissä.</string>
     <string name="upgrades_no_purchases_found_check_account">Ostoksia ei löytynyt. Käytätkö oikeaa tiliä?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play -virhe</string>
+    <string name="upgrades_gplay_billing_error_description">Google Playssa tapahtui virhe. Yritä myöhemmin uudelleen tai käynnistä puhelimesi uudelleen.\n\nVirhe: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play -laskutusvirhe</string>
+    <string name="upgrades_gplay_billing_result_error_description">Ostotietojen hakemisessa Google Playsta tapahtui virhe. Tyhjennä Google Playn välimuisti ja käynnistä puhelimesi uudelleen.\n\nVirhe %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Hindi available ang mga serbisyo ng Google Play.</string>
     <string name="upgrades_no_purchases_found_check_account">Walang nakitang binili. Tamang account ba ang gamit mo?</string>
+    <string name="upgrades_gplay_billing_error_label">Error sa Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Nagkaroon ng error sa Google Play. Pakisubukan ulit mamaya o i-reboot ang iyong telepono.\n\nError: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Error sa Google Play Billing</string>
+    <string name="upgrades_gplay_billing_result_error_description">Nagkaroon ng error sa paghingi ng detalye ng iyong pagbili sa Google Play. I-clear ang Google Play cache at i-reboot ang iyong telepono.\n\nError %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Os servizos de Google Play non están dispoñibles.</string>
     <string name="upgrades_no_purchases_found_check_account">Non se atoparon compras. Estás a usar a conta correcta?</string>
+    <string name="upgrades_gplay_billing_error_label">Erro de Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Houbo un erro en Google Play. Téntao de novo máis tarde ou reinicia o teu teléfono.\n\nErro: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Erro de facturación de Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Houbo un erro ao solicitar os detalles da túa compra a Google Play. Limpa a caché de Google Play e reinicia o teu teléfono.\n\nErro %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play सेवाएं अनुपलब्ध हैं।</string>
     <string name="upgrades_no_purchases_found_check_account">कोई खरीदारी नहीं मिली, क्या आप सही खाते का उपयोग कर रहे हैं?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play त्रुटि</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play में एक त्रुटि हुई। कृपया बाद में पुनः प्रयास करें या अपना फ़ोन रीबूट करें।\n\nत्रुटि: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play बिलिंग त्रुटि</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play से आपकी खरीदारी का विवरण प्राप्त करते समय एक त्रुटि हुई। Google Play कैश साफ़ करें और अपना फ़ोन रीबूट करें।\n\nत्रुटि %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Usluge Google Playa nisu dostupne.</string>
     <string name="upgrades_no_purchases_found_check_account">Nisu pronađene kupnje. Koristite li pravi račun?</string>
+    <string name="upgrades_gplay_billing_error_label">Greška Google Playa</string>
+    <string name="upgrades_gplay_billing_error_description">Došlo je do greške u Google Playu. Pokušajte ponovo kasnije ili ponovo pokrenite telefon.\n\nGreška: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Greška naplate Google Playa</string>
+    <string name="upgrades_gplay_billing_result_error_description">Došlo je do greške prilikom dohvaćanja podataka o kupnji iz Google Playa. Očistite predmemoriju Google Playa i ponovo pokrenite telefon.\n\nGreška %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">A Google Play szolgáltatások nem érhetők el.</string>
     <string name="upgrades_no_purchases_found_check_account">Nem található vásárlás. A megfelelő fiókot használja?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play hiba</string>
+    <string name="upgrades_gplay_billing_error_description">Hiba történt a Google Playben. Kérjük, próbálja újra később, vagy indítsa újra a telefonját.\n\nHiba: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play számlázási hiba</string>
+    <string name="upgrades_gplay_billing_result_error_description">Hiba történt a vásárlási adatok lekérésekor a Google Playből. Törölje a Google Play gyorsítótárát, és indítsa újra a telefonját.\n\nHiba %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play ծառայությունները հասանելի չեն:</string>
     <string name="upgrades_no_purchases_found_check_account">Գնումներ չեն գտնվել: Արդյո՞ք ճիշտ հաշիվն եք օգտագործում:</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-ի սխալ</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-ում սխալ է տեղի ունեցել: Խնդրում ենք փորձել ավելի ուշ կամ վերագործարկել ձեր հեռախոսը.\n\nՍխալ: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play Billing-ի սխալ</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play-ից ձեր գնումների տվյալները հարցնելիս սխալ է տեղի ունեցել: Մաքրեք Google Play-ի քեշը և վերագործարկեք ձեր հեռախոսը.\n\nՍխալ %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Layanan Google Play tidak tersedia.</string>
     <string name="upgrades_no_purchases_found_check_account">Tidak ada pembelian yang ditemukan. Apakah Anda menggunakan akun yang benar?</string>
+    <string name="upgrades_gplay_billing_error_label">Kesalahan Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Terjadi kesalahan di Google Play. Silakan coba lagi nanti atau mulai ulang ponsel Anda.\n\nKesalahan: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Kesalahan Penagihan Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Terjadi kesalahan saat meminta detail pembelian Anda dari Google Play. Hapus cache Google Play dan mulai ulang ponsel Anda.\n\nKesalahan %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play þjónustur eru ekki tiltækar.</string>
     <string name="upgrades_no_purchases_found_check_account">Engin kaup fundust. Ertu að nota réttan aðgang?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play villa</string>
+    <string name="upgrades_gplay_billing_error_description">Villa kom upp í Google Play. Vinsamlegast reyndu aftur síðar eða endurræstu símann þinn.\n\nVilla: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play innheimtuvilla</string>
+    <string name="upgrades_gplay_billing_result_error_description">Villa kom upp við að sækja upplýsingar um kaupin þín frá Google Play. Hreinsaðu skyndiminni Google Play og endurræstu símann þinn.\n\nVilla %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">I servizi di Google Play non sono disponibili.</string>
     <string name="upgrades_no_purchases_found_check_account">Nessun acquisto trovato. Stai usando l\'account giusto?</string>
+    <string name="upgrades_gplay_billing_error_label">Errore di Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Si è verificato un errore in Google Play. Riprova più tardi o riavvia il telefono.\n\nErrore: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Errore di fatturazione Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Si è verificato un errore durante la richiesta dei dettagli di acquisto a Google Play. Svuota la cache di Google Play e riavvia il telefono.\n\nErrore %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">שירותי Google Play אינם זמינים.</string>
     <string name="upgrades_no_purchases_found_check_account">לא נמצאו רכישות. האם אתה משתמש בחשבון הנכון?</string>
+    <string name="upgrades_gplay_billing_error_label">שגיאת Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">אירעה שגיאה ב-Google Play. נסה שוב מאוחר יותר או הפעל מחדש את הטלפון.\n\nשגיאה: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">שגיאת חיוב Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">אירעה שגיאה בעת בקשת פרטי הרכישה מ-Google Play. נקה את המטמון של Google Play והפעל מחדש את הטלפון.\n\nשגיאה %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Playサービスが利用できません。</string>
     <string name="upgrades_no_purchases_found_check_account">購入履歴がありません。正しいアカウントを使用していますか？</string>
+    <string name="upgrades_gplay_billing_error_label">Google Playエラー</string>
+    <string name="upgrades_gplay_billing_error_description">Google Playでエラーが発生しました。後でもう一度お試しいただくか、スマートフォンを再起動してください。\n\nエラー: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play請求エラー</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Playに購入情報を問い合わせる際にエラーが発生しました。Google Playのキャッシュをクリアし、スマートフォンを再起動してください。\n\nエラー %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play სერვისები მიუწვდომელია.</string>
     <string name="upgrades_no_purchases_found_check_account">შენაძენები ვერ მოიძებნა. იყენებთ სწორ ანგარიშს?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-ის შეცდომა</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-ში მოხდა შეცდომა. სცადეთ მოგვიანებით ან გადატვირთეთ ტელეფონი.\n\nშეცდომა: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play ბილინგის შეცდომა</string>
+    <string name="upgrades_gplay_billing_result_error_description">შეცდომა მოხდა Google Play-დან შენაძენის დეტალების მოთხოვნისას. გაასუფთავეთ Google Play-ის ქეში და გადატვირთეთ ტელეფონი.\n\nშეცდომა %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">សេវាកម្ម Google Play មិនអាចប្រើបានទេ</string>
     <string name="upgrades_no_purchases_found_check_account">រកមិនឃើញការទិញទេ។ តើអ្នកកំពុងប្រើគណនីត្រឹមត្រូវទេ?</string>
+    <string name="upgrades_gplay_billing_error_label">កំហុស Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">មានកំហុសនៅក្នុង Google Play។ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ ឬចាប់ផ្តើមទូរសព្ទឡើងវិញ។\n\nកំហុស: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">កំហុសការចេញវិក្កយបត្រ Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">មានកំហុសពេលស្នើសុំព័ត៌មានការទិញពី Google Play។ សូមសម្អាតឃ្លាំងសម្ងាត់ Google Play និងចាប់ផ្តើមទូរសព្ទឡើងវិញ។\n\nកំហុស %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Xizmetên Google Play ne berdest in.</string>
     <string name="upgrades_no_purchases_found_check_account">Kirîn nehatin dîtin. Hûn hesabê rast bikar tînin?</string>
+    <string name="upgrades_gplay_billing_error_label">Çewtiya Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Di Google Play de çewtiyek çêbû. Ji kerema xwe paşê dîsa biceribîne an jî têlefona xwe ji nû ve bide destpêkirin.\n\nÇewtî: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Çewtiya Fatûrekirina Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Dema ku ji Google Play agahdariyên kirîna we hat xwestin çewtiyek çêbû. Pêşbîra Google Play paqij bikin û têlefona xwe ji nû ve bide destpêkirin.\n\nÇewtî %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play ಸೇವೆಗಳು ಲಭ್ಯವಿಲ್ಲ.</string>
     <string name="upgrades_no_purchases_found_check_account">ಯಾವುದೇ ಖರೀದಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ. ನೀವು ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಾ?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play ದೋಷ</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play ನಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ. ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ.\n\nದೋಷ: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play ಬಿಲ್ಲಿಂಗ್ ದೋಷ</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play ನಿಂದ ನಿಮ್ಮ ಖರೀದಿ ವಿವರಗಳನ್ನು ಕೇಳುವಾಗ ದೋಷ ಸಂಭವಿಸಿದೆ. Google Play ಕ್ಯಾಶ್ ಅನ್ನು ತೆರವುಗೊಳಿಸಿ ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ.\n\nದೋಷ %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play кызматтары жеткиликсиз.</string>
     <string name="upgrades_no_purchases_found_check_account">Эч кандай сатып алуулар табылган жок. Туура каттоо эсебин колдонуп жатасызбы?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play катасы</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play\'де ката кетти. Кийинчерээк кайра аракет кылыңыз же телефонуңузду өчүрүп күйгүзүңүз.\n\nКата: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play төлөм катасы</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play\'ден сатып алуу маалыматын сурап жатканда ката кетти. Google Play кэшин тазалаңыз жана телефонуңузду өчүрүп күйгүзүңүз.\n\nКата %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">ບໍລິການ Google Play ບໍ່ສາມາດໃຊ້ໄດ້.</string>
     <string name="upgrades_no_purchases_found_check_account">ບໍ່ພົບການຊື້. ທ່ານກຳລັງໃຊ້ບັນຊີທີ່ຖືກຕ້ອງບໍ?</string>
+    <string name="upgrades_gplay_billing_error_label">ຂໍ້ຜິດພາດ Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">ເກີດຂໍ້ຜິດພາດໃນ Google Play. ກະລຸນາລອງໃໝ່ພາຍຫຼັງ ຫຼືປິດເປີດໂທລະສັບຂອງທ່ານໃໝ່.\n\nຂໍ້ຜິດພາດ: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">ຂໍ້ຜິດພາດການຮຽກເກັບເງິນ Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">ເກີດຂໍ້ຜິດພາດໃນການຂໍລາຍລະອຽດການຊື້ຈາກ Google Play. ລຶບແຄສ Google Play ແລະປິດເປີດໂທລະສັບຂອງທ່ານໃໝ່.\n\nຂໍ້ຜິດພາດ %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">„Google Play“ paslaugos nepasiekiamos.</string>
     <string name="upgrades_no_purchases_found_check_account">Nerasta jokių pirkinių. Ar naudojate tinkamą paskyrą?</string>
+    <string name="upgrades_gplay_billing_error_label">„Google Play\" klaida</string>
+    <string name="upgrades_gplay_billing_error_description">„Google Play\" įvyko klaida. Bandykite dar kartą vėliau arba paleiskite telefoną iš naujo.\n\nKlaida: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">„Google Play\" atsiskaitymo klaida</string>
+    <string name="upgrades_gplay_billing_result_error_description">Įvyko klaida gaunant pirkinių informaciją iš „Google Play\". Išvalykite „Google Play\" talpyklą ir paleiskite telefoną iš naujo.\n\nKlaida %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play pakalpojumi nav pieejami.</string>
     <string name="upgrades_no_purchases_found_check_account">Nav atrasts neviens pirkums. Vai izmantojat pareizo kontu?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play kļūda</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play radās kļūda. Lūdzu, mēģiniet vēlreiz vēlāk vai pārstartējiet tālruni.\n\nKļūda: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play norēķinu kļūda</string>
+    <string name="upgrades_gplay_billing_result_error_description">Radās kļūda, pieprasot no Google Play jūsu pirkuma informāciju. Notīriet Google Play kešatmiņu un pārstartējiet tālruni.\n\nKļūda %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Услугите на Google Play не се достапни.</string>
     <string name="upgrades_no_purchases_found_check_account">Не се пронајдени купувања. Дали ја користите вистинската сметка?</string>
+    <string name="upgrades_gplay_billing_error_label">Грешка во Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Настана грешка во Google Play. Обидете се повторно подоцна или рестартирајте го телефонот.\n\nГрешка: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Грешка при наплата на Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Настана грешка при барање на деталите за вашата купувања од Google Play. Исчистете го кешот на Google Play и рестартирајте го телефонот.\n\nГрешка %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play സേവനങ്ങൾ ലഭ്യമല്ല.</string>
     <string name="upgrades_no_purchases_found_check_account">വാങ്ങലുകളൊന്നും കണ്ടെത്തിയില്ല. നിങ്ങൾ ശരിയായ അക്കൗണ്ട് ആണോ ഉപയോഗിക്കുന്നത്?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play പിശക്</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-ൽ ഒരു പിശക് സംഭവിച്ചു. ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക അല്ലെങ്കിൽ നിങ്ങളുടെ ഫോൺ റീബൂട്ട് ചെയ്യുക.\n\nപിശക്: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play ബില്ലിംഗ് പിശക്</string>
+    <string name="upgrades_gplay_billing_result_error_description">നിങ്ങളുടെ വാങ്ങൽ വിശദാംശങ്ങൾക്കായി Google Play-യോട് അഭ്യർത്ഥിക്കുമ്പോൾ ഒരു പിശക് സംഭവിച്ചു. Google Play കാഷെ മായ്‌ച്ച് നിങ്ങളുടെ ഫോൺ റീബൂട്ട് ചെയ്യുക.\n\nപിശക് %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play үйлчилгээ боломжгүй байна.</string>
     <string name="upgrades_no_purchases_found_check_account">Худалдан авалт олдсонгүй. Та зөв бүртгэл ашиглаж байна уу?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play алдаа</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play-д алдаа гарлаа. Дараа дахин оролдоно уу эсвэл утсаа дахин асаана уу.\n\nАлдаа: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play төлбөрийн алдаа</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play-с таны худалдан авалтын мэдээллийг авахад алдаа гарлаа. Google Play кэшийг цэвэрлээд утсаа дахин асаана уу.\n\nАлдаа %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play सेवा अनुपलब्ध आहेत.</string>
     <string name="upgrades_no_purchases_found_check_account">कोणतीही खरेदी आढळली नाही. तुम्ही योग्य खाते वापरत आहात का?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play त्रुटी</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play मध्ये त्रुटी आली. कृपया नंतर पुन्हा प्रयत्न करा किंवा तुमचा फोन रीबूट करा.\n\nत्रुटी: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play बिलिंग त्रुटी</string>
+    <string name="upgrades_gplay_billing_result_error_description">तुमच्या खरेदीचे तपशील Google Play कडून मिळवताना त्रुटी आली. Google Play कॅशे साफ करा आणि तुमचा फोन रीबूट करा.\n\nत्रुटी %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Perkhidmatan Google Play tidak tersedia.</string>
     <string name="upgrades_no_purchases_found_check_account">Tiada pembelian ditemui. Adakah anda menggunakan akaun yang betul?</string>
+    <string name="upgrades_gplay_billing_error_label">Ralat Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Terdapat ralat dalam Google Play. Sila cuba lagi kemudian atau mulakan semula telefon anda.\n\nRalat: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Ralat Pengebilan Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Terdapat ralat semasa meminta butiran pembelian anda daripada Google Play. Kosongkan cache Google Play dan mulakan semula telefon anda.\n\nRalat %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play ဝန်ဆောင်မှုများ မရရှိနိုင်ပါ။</string>
     <string name="upgrades_no_purchases_found_check_account">ဝယ်ယူမှုများ မတွေ့ပါ။ သင်အသုံးပြုနေသော အကောင့်မှန်ကန်ပါသလား။</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play အမှား</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play တွင် အမှားတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ ကျေးဇူးပြု၍ နောက်မှ ထပ်ကြိုးစားပါ သို့မဟုတ် သင့်ဖုန်းကို ပြန်လည်စတင်ပါ။\n\nအမှား: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play ငွေတောင်းခံမှု အမှား</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play မှ သင့်ဝယ်ယူမှု အသေးစိတ်အချက်အလက်များကို တောင်းဆိုရာတွင် အမှားတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ Google Play ကက်ရှ်ကို ရှင်းလင်းပြီး သင့်ဖုန်းကို ပြန်လည်စတင်ပါ။\n\nအမှား %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play-tjenester er utilgjengelige.</string>
     <string name="upgrades_no_purchases_found_check_account">Ingen kjøp funnet. Bruker du riktig konto?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-feil</string>
+    <string name="upgrades_gplay_billing_error_description">Det oppstod en feil i Google Play. Prøv igjen senere eller start telefonen på nytt.\n\nFeil: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play-faktureringsfeil</string>
+    <string name="upgrades_gplay_billing_result_error_description">Det oppstod en feil da Google Play ble spurt om kjøpsdetaljene dine. Tøm Google Play-hurtigbufferen og start telefonen på nytt.\n\nFeil %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play सेवाहरू अनुपलब्ध छन्।</string>
     <string name="upgrades_no_purchases_found_check_account">कुनै खरिदहरू फेला परेनन्। के तपाईंले सही खाता प्रयोग गरिरहनुभएको छ?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play त्रुटि</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play मा त्रुटि भयो। कृपया पछि पुन: प्रयास गर्नुहोस् वा आफ्नो फोन रिबुट गर्नुहोस्।\n\nत्रुटि: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play बिलिङ त्रुटि</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play बाट तपाईंको खरिद विवरणहरू माग्दा त्रुटि भयो। Google Play क्यास खाली गर्नुहोस् र आफ्नो फोन रिबुट गर्नुहोस्।\n\nत्रुटि %s</string>
 </resources>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="upgrades_gplay_unavailable_error">De Google Play-diensten zijn niet beschikbaar.</string>
+    <string name="upgrades_gplay_unavailable_error">De Google Play diensten zijn niet beschikbaar.</string>
     <string name="upgrades_no_purchases_found_check_account">Geen aankopen gevonden. Gebruikt u de juiste rekening?</string>
     <string name="upgrades_gplay_billing_error_label">Google Play Fout</string>
     <string name="upgrades_gplay_billing_error_description">Er is een fout opgetreden in Google Play. Probeer het later opnieuw of start je telefoon opnieuw op.\n\nFout: %s</string>
-    <string name="upgrades_gplay_billing_result_error_label">Google Play Factureringsfout</string>
+    <string name="upgrades_gplay_billing_result_error_label">Factureringsfout bij Google Play</string>
     <string name="upgrades_gplay_billing_result_error_description">Er is een fout opgetreden bij het opvragen van je aankoopgegevens bij Google Play. Wis de cache van Google Play en start je telefoon opnieuw op.\n\nFout %s</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="upgrades_gplay_unavailable_error">Usługi Google Play nie są dostępne.</string>
-    <string name="upgrades_no_purchases_found_check_account">Nie znaleziono zakupu. Czy na pewno korzystasz z poprawnego konta?</string>
+    <string name="upgrades_gplay_unavailable_error">Usługi Google Play są niedostępne.</string>
+    <string name="upgrades_no_purchases_found_check_account">Nie znaleziono zakupów. Czy używasz właściwego konta?</string>
     <string name="upgrades_gplay_billing_error_label">Błąd Google Play</string>
     <string name="upgrades_gplay_billing_error_description">Wystąpił błąd w Google Play. Spróbuj ponownie później lub uruchom ponownie telefon.\n\nBłąd: %s</string>
     <string name="upgrades_gplay_billing_result_error_label">Błąd płatności Google Play</string>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Os serviços do Google Play não estão disponíveis.</string>
     <string name="upgrades_no_purchases_found_check_account">Nenhuma compra encontrada. Você está usando a conta certa?</string>
+    <string name="upgrades_gplay_billing_error_label">Erro do Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Houve um erro no Google Play. Por favor, tente novamente mais tarde ou reinicie seu telefone.\n\nError: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Erro de faturamento do Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Houve um erro ao solicitar ao Google Play os seus detalhes de compra. Limpe o cache do Google Play e reinicie o seu telefone. \n\nError %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Os serviços do Google Play estão indisponíveis.</string>
     <string name="upgrades_no_purchases_found_check_account">Nenhuma compra encontrada. Está a usar a conta correta?</string>
+    <string name="upgrades_gplay_billing_error_label">Erro do Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Ocorreu um erro no Google Play. Tente novamente mais tarde ou reinicie o telemóvel.\n\nErro: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Erro de faturação do Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Ocorreu um erro ao solicitar os detalhes da sua compra ao Google Play. Limpe a cache do Google Play e reinicie o telemóvel.\n\nErro %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Ils servezzans da Google Play n\'èn betg disponibels.</string>
     <string name="upgrades_no_purchases_found_check_account">Nagins acquists chattads. Utiliseschas ti il conto gist?</string>
+    <string name="upgrades_gplay_billing_error_label">Errur da Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Igl ha dà ina errur en Google Play. Emprova per plaschair pli tard u reavvia tes telefon.\n\nErrur: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Errur da facturaziun da Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Igl ha dà ina errur cun la dumonda dals detagls da tes acquist tar Google Play. Stizza il cache da Google Play e reavvia tes telefon.\n\nErrur %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Serviciile Google Play nu sunt disponibile.</string>
     <string name="upgrades_no_purchases_found_check_account">Nu s-au găsit achiziții. Folosești contul corect?</string>
+    <string name="upgrades_gplay_billing_error_label">Eroare Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">A apărut o eroare în Google Play. Vă rugăm să încercați din nou mai târziu sau reporniți telefonul.\n\nEroare: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Eroare de facturare Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">A apărut o eroare la solicitarea detaliilor achiziției de la Google Play. Ștergeți memoria cache Google Play și reporniți telefonul.\n\nEroare %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Servìtzios Google Play non sunt disponìbiles.</string>
     <string name="upgrades_no_purchases_found_check_account">Perunu achistu agatadu. Ses usende su contu giustu?</string>
+    <string name="upgrades_gplay_billing_error_label">Errore de Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">B\'at àpidu un errore in Google Play. Proa torra prus a tardu o torra a allùere su telèfonu.\n\nErrore: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Errore de fatturatzione de Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">B\'at àpidu un errore cando si cherent is detàllios de s\'achistu a Google Play. Isbòida sa cache de Google Play e torra a allùere su telèfonu.\n\nErrore %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">ගූගල් ප්ලේ සේවා නොතිබේ.</string>
     <string name="upgrades_no_purchases_found_check_account">කිසිදු මිලදී ගැනීමක් හමු නොවීය. ඔබ ትክክለኛ ගිණුම භාවිතා කරනවාද?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play දෝෂය</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play හි දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න හෝ ඔබේ දුරකථනය නැවත ආරම්භ කරන්න.\n\nදෝෂය: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play බිල්පත් දෝෂය</string>
+    <string name="upgrades_gplay_billing_result_error_description">ඔබේ මිලදී ගැනීමේ විස්තර සඳහා Google Play වෙත ඉල්ලීමේදී දෝෂයක් ඇති විය. Google Play හැඹිලිය හිස් කර ඔබේ දුරකථනය නැවත ආරම්භ කරන්න.\n\nදෝෂය %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Služby Google Play nie sú k dispozícii.</string>
     <string name="upgrades_no_purchases_found_check_account">Nenašli sa žiadne nákupy. Používate správny účet?</string>
+    <string name="upgrades_gplay_billing_error_label">Chyba Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">V službe Google Play sa vyskytla chyba. Skúste to prosím neskôr alebo reštartujte telefón.\n\nChyba: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Chyba fakturácie Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Pri získavaní podrobností o vašom nákupe z Google Play sa vyskytla chyba. Vymažte vyrovnávaciu pamäť Google Play a reštartujte telefón.\n\nChyba %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Storitve Google Play niso na voljo.</string>
     <string name="upgrades_no_purchases_found_check_account">Ni najdenih nakupov. Ali uporabljate pravi račun?</string>
+    <string name="upgrades_gplay_billing_error_label">Napaka Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Prišlo je do napake v storitvi Google Play. Poskusite znova pozneje ali znova zaženite telefon.\n\nNapaka: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Napaka pri obračunavanju Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Prišlo je do napake pri pridobivanju podrobnosti o vašem nakupu iz Google Play. Počistite predpomnilnik Google Play in znova zaženite telefon.\n\nNapaka %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Shërbimet e Google Play nuk janë të disponueshme.</string>
     <string name="upgrades_no_purchases_found_check_account">Nuk u gjetën blerje. Po përdorni llogarinë e duhur?</string>
+    <string name="upgrades_gplay_billing_error_label">Gabim i Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Kishte një gabim në Google Play. Ju lutemi provoni përsëri më vonë ose rinisni telefonin tuaj.\n\nGabim: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Gabim i faturimit të Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Kishte një gabim kur u kërkuan detajet e blerjes suaj nga Google Play. Pastroni memorien e përkohshme të Google Play dhe rinisni telefonin tuaj.\n\nGabim %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play услуге нису доступне.</string>
     <string name="upgrades_no_purchases_found_check_account">Није пронађена ниједна куповина. Да ли користите прави налог?</string>
+    <string name="upgrades_gplay_billing_error_label">Грешка Google Play-а</string>
+    <string name="upgrades_gplay_billing_error_description">Дошло је до грешке у Google Play-у. Покушајте поново касније или рестартујте телефон.\n\nГрешка: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Грешка наплате Google Play-а</string>
+    <string name="upgrades_gplay_billing_result_error_description">Дошло је до грешке при захтевању детаља о вашој куповини од Google Play-а. Обришите кеш Google Play-а и рестартујте телефон.\n\nГрешка %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play-tjänster är inte tillgängliga.</string>
     <string name="upgrades_no_purchases_found_check_account">Inga köp hittades. Använder du rätt konto?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play-fel</string>
+    <string name="upgrades_gplay_billing_error_description">Det uppstod ett fel i Google Play. Försök igen senare eller starta om din telefon.\n\nFel: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play faktureringsfel</string>
+    <string name="upgrades_gplay_billing_result_error_description">Det uppstod ett fel vid hämtning av dina köpuppgifter från Google Play. Rensa Google Play-cachen och starta om din telefon.\n\nFel %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Huduma za Google Play hazipatikani.</string>
     <string name="upgrades_no_purchases_found_check_account">Hakuna manunuzi yaliyopatikana. Je, unatumia akaunti sahihi?</string>
+    <string name="upgrades_gplay_billing_error_label">Hitilafu ya Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Kulikuwa na hitilafu katika Google Play. Tafadhali jaribu tena baadaye au uzime na uwashe simu yako.\n\nHitilafu: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Hitilafu ya malipo ya Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Kulikuwa na hitilafu wakati wa kuomba maelezo ya ununuzi wako kutoka Google Play. Futa kashe ya Google Play na uzime na uwashe simu yako.\n\nHitilafu %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play சேவைகள் கிடைக்கவில்லை.</string>
     <string name="upgrades_no_purchases_found_check_account">வாங்குதல்கள் எதுவும் இல்லை. நீங்கள் சரியான கணக்கைப் பயன்படுத்துகிறீர்களா?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play பிழை</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play இல் ஒரு பிழை ஏற்பட்டது. தயவுசெய்து பின்னர் மீண்டும் முயற்சிக்கவும் அல்லது உங்கள் தொலைபேசியை மறுதொடக்கம் செய்யவும்.\n\nபிழை: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play பில்லிங் பிழை</string>
+    <string name="upgrades_gplay_billing_result_error_description">உங்கள் வாங்குதல் விவரங்களை Google Play-யிடம் கேட்கும்போது ஒரு பிழை ஏற்பட்டது. Google Play கேச்-ஐ அழித்து உங்கள் தொலைபேசியை மறுதொடக்கம் செய்யவும்.\n\nபிழை %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play సేవలు అందుబాటులో లేవు.</string>
     <string name="upgrades_no_purchases_found_check_account">కొనుగోళ్లు ఏవీ కనుగొనబడలేదు. మీరు సరైన ఖాతాను ఉపయోగిస్తున్నారా?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play లోపం</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play లో ఒక లోపం జరిగింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి లేదా మీ ఫోన్‌ను రీబూట్ చేయండి.\n\nలోపం: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play Billing లోపం</string>
+    <string name="upgrades_gplay_billing_result_error_description">మీ కొనుగోలు వివరాల కోసం Google Play ను అడిగేటప్పుడు ఒక లోపం జరిగింది. Google Play క్యాష్‌ను క్లియర్ చేసి మీ ఫోన్‌ను రీబూట్ చేయండి.\n\nలోపం %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">บริการ Google Play ไม่พร้อมใช้งาน</string>
     <string name="upgrades_no_purchases_found_check_account">ไม่พบการสั่งซื้อ คุณใช้บัญชีที่ถูกต้องหรือไม่</string>
+    <string name="upgrades_gplay_billing_error_label">ข้อผิดพลาด Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">เกิดข้อผิดพลาดใน Google Play โปรดลองอีกครั้งในภายหลังหรือรีบูตโทรศัพท์ของคุณ\n\nข้อผิดพลาด: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">ข้อผิดพลาดการเรียกเก็บเงินของ Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">เกิดข้อผิดพลาดขณะขอรายละเอียดการสั่งซื้อของคุณจาก Google Play ล้างแคช Google Play แล้วรีบูตโทรศัพท์ของคุณ\n\nข้อผิดพลาด %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play hizmetleri kullanılamıyor.</string>
     <string name="upgrades_no_purchases_found_check_account">Satın alma bulunamadı. Doğru hesabı mı kullanıyorsunuz?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play Hatası</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play üzerinde bir hata oluştu. Lütfen daha sonra tekrar deneyin veya telefonunuzu yeniden başlatın.\n\nHata: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play Faturalandırma Hatası</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play üzerinden satın alma ayrıntılarınız istenirken bir hata oluştu. Google Play önbelleğini temizleyin ve telefonunuzu yeniden başlatın.\n\nHata %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Сервіси Google Play недоступні.</string>
     <string name="upgrades_no_purchases_found_check_account">Покупок не знайдено. Ви справді використовуєте правильний обліковий запис?</string>
+    <string name="upgrades_gplay_billing_error_label">Помилка Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">У Google Play сталася помилка. Спробуйте ще раз пізніше або перезавантажте телефон.\n\nПомилка: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Помилка платіжної системи Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Сталася помилка під час отримання даних про покупки з Google Play. Очистіть кеш Google Play та перезавантажте телефон.\n\nПомилка %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play کی سروسز دستیاب نہیں ہیں۔</string>
     <string name="upgrades_no_purchases_found_check_account">کوئی خریداری نہیں ملی۔ کیا آپ درست اکاؤنٹ استعمال کر رہے ہیں؟</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play خرابی</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play میں ایک خرابی پیش آئی۔ براہ کرم بعد میں دوبارہ کوشش کریں یا اپنا فون ری بوٹ کریں۔\n\nخرابی: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play بلنگ خرابی</string>
+    <string name="upgrades_gplay_billing_result_error_description">آپ کی خریداری کی تفصیلات کے لیے Google Play سے پوچھتے وقت ایک خرابی پیش آئی۔ Google Play کیش صاف کریں اور اپنا فون ری بوٹ کریں۔\n\nخرابی %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play xizmatlari mavjud emas.</string>
     <string name="upgrades_no_purchases_found_check_account">Xaridlar topilmadi. To‘g‘ri hisobdan foydalanayapsizmi?</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play xatosi</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play’da xatolik yuz berdi. Iltimos, keyinroq qayta urinib ko‘ring yoki telefoningizni qayta ishga tushiring.\n\nXato: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play Billing xatosi</string>
+    <string name="upgrades_gplay_billing_result_error_description">Google Play’dan xaridingiz tafsilotlarini so‘rashda xatolik yuz berdi. Google Play keshini tozalang va telefoningizni qayta ishga tushiring.\n\nXato %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Các dịch vụ của Google Play không khả dụng.</string>
     <string name="upgrades_no_purchases_found_check_account">Không tìm thấy giao dịch mua nào. Bạn có đang sử dụng đúng tài khoản không?</string>
+    <string name="upgrades_gplay_billing_error_label">Lỗi Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Đã xảy ra lỗi trong Google Play. Vui lòng thử lại sau hoặc khởi động lại điện thoại của bạn.\n\nLỗi: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Lỗi thanh toán Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Đã xảy ra lỗi khi yêu cầu Google Play cung cấp chi tiết giao dịch mua của bạn. Hãy xóa bộ nhớ đệm của Google Play và khởi động lại điện thoại của bạn.\n\nLỗi %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play 服务不可用</string>
     <string name="upgrades_no_purchases_found_check_account">未找到购买记录，您使用的帐户正确吗？</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play 错误</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play 出现错误。请稍后重试或重启手机。\n\n错误：%s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play 结算错误</string>
+    <string name="upgrades_gplay_billing_result_error_description">向 Google Play 请求您的购买详情时出错。请清除 Google Play 缓存并重启手机。\n\n错误 %s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play 服務無法使用。</string>
     <string name="upgrades_no_purchases_found_check_account">未找到訂單，確定帳戶無誤？</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play 錯誤</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play 發生錯誤。請稍後再試或重新啟動手機。\n\n錯誤：%s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play 結帳錯誤</string>
+    <string name="upgrades_gplay_billing_result_error_description">向 Google Play 請求購買明細時發生錯誤。請清除 Google Play 快取並重新啟動手機。\n\n錯誤：%s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Google Play 服務無法使用。</string>
     <string name="upgrades_no_purchases_found_check_account">未找到訂單，確定帳戶無誤？</string>
+    <string name="upgrades_gplay_billing_error_label">Google Play 錯誤</string>
+    <string name="upgrades_gplay_billing_error_description">Google Play 發生錯誤。請稍後再試或重新啟動手機。\n\n錯誤：%s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Google Play 結帳錯誤</string>
+    <string name="upgrades_gplay_billing_result_error_description">向 Google Play 請求購買明細時發生錯誤。請清除 Google Play 快取並重新啟動手機。\n\n錯誤：%s</string>
 </resources>

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

@@ -2,4 +2,8 @@
 <resources>
     <string name="upgrades_gplay_unavailable_error">Amasevisi e-Google Play awakutholakali.</string>
     <string name="upgrades_no_purchases_found_check_account">Akukho ukuthenga okutholakele. Ingabe usebenzisa i-akhawunti efanele?</string>
+    <string name="upgrades_gplay_billing_error_label">Iphutha le-Google Play</string>
+    <string name="upgrades_gplay_billing_error_description">Kube nephutha ku-Google Play. Sicela uzame futhi ngemuva kwesikhathi noma uqalise kabusha ifoni yakho.\n\nIphutha: %s</string>
+    <string name="upgrades_gplay_billing_result_error_label">Iphutha Lokukhokha le-Google Play</string>
+    <string name="upgrades_gplay_billing_result_error_description">Kube nephutha lapho kucelwa ku-Google Play imininingwane yokuthenga kwakho. Sula inqolobane ye-Google Play bese uqalisa kabusha ifoni yakho.\n\nIphutha %s</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="eu.darken.capod">
 
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -9,6 +8,8 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
 
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
@@ -58,13 +59,21 @@
         </activity>
 
         <receiver
-            android:name=".bluetooth.BleScanResultReceiver"
+            android:name=".common.bluetooth.BleScanResultReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="eu.darken.capod.bluetooth.DELIVER_SCAN_RESULTS" />
             </intent-filter>
         </receiver>
 
+        <receiver
+            android:name=".monitor.core.receiver.BootCompletedReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name=".monitor.core.receiver.BluetoothEventReceiver"
             android:enabled="true"
@@ -112,24 +121,10 @@
             android:name=".common.debug.recording.ui.RecorderActivity"
             android:theme="@style/AppThemeFloating" />
 
-        <!-- Worker stuff-->
         <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:name=".monitor.core.worker.MonitorService"
             android:foregroundServiceType="connectedDevice"
-            tools:node="merge" />
-
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-
-        </provider>
+            android:exported="false" />
     </application>
 
 </manifest>

app/src/main/java/eu/darken/capod/App.kt

@@ -1,10 +1,7 @@
 package eu.darken.capod
 
 import android.app.Application
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
-import eu.darken.capod.common.BuildConfigWrap
 import eu.darken.capod.common.coroutine.AppScope
 import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
 import eu.darken.capod.common.debug.logging.LogCatLogger
@@ -23,13 +20,11 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltAndroidApp
-open class App : Application(), Configuration.Provider {
+open class App : Application() {
 
-    @Inject lateinit var workerFactory: HiltWorkerFactory
     @Inject lateinit var autoReporting: AutomaticBugReporter
     @Inject lateinit var monitorControl: MonitorControl
     @Inject lateinit var podMonitor: PodMonitor
@@ -45,9 +40,7 @@ open class App : Application(), Configuration.Provider {
 
         log(TAG) { "onCreate() done! ${Exception().asLog()}" }
 
-        appScope.launch {
-            monitorControl.startMonitor(forceStart = true)
-        }
+        monitorControl.startMonitor(forceStart = true)
 
         podMonitor.devicesWithProfiles()
             .distinctUntilChanged()
@@ -68,21 +61,6 @@ open class App : Application(), Configuration.Provider {
             .launchIn(appScope)
     }
 
-
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder()
-            .setMinimumLoggingLevel(
-                when {
-                    BuildConfigWrap.DEBUG -> android.util.Log.VERBOSE
-                    BuildConfigWrap.BUILD_TYPE == BuildConfigWrap.BuildType.DEV -> android.util.Log.DEBUG
-                    BuildConfigWrap.BUILD_TYPE == BuildConfigWrap.BuildType.BETA -> android.util.Log.INFO
-                    BuildConfigWrap.BUILD_TYPE == BuildConfigWrap.BuildType.RELEASE -> android.util.Log.WARN
-                    else -> android.util.Log.VERBOSE
-                }
-            )
-            .setWorkerFactory(workerFactory)
-            .build()
-
     companion object {
         internal val TAG = logTag("CAP")
     }

app/src/main/java/eu/darken/capod/common/EdgeToEdgeHelper.kt

@@ -2,7 +2,6 @@ package eu.darken.capod.common
 
 import android.app.Activity
 import android.view.View
-import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import eu.darken.capod.common.debug.logging.logTag
@@ -20,12 +19,14 @@ class EdgeToEdgeHelper(activity: Activity) {
         bottom: Boolean = false,
     ) {
         ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
-            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
             v.setPadding(
-                if (left) systemBars.left else v.paddingLeft,
-                if (top) systemBars.top else v.paddingTop,
-                if (right) systemBars.right else v.paddingRight,
-                if (bottom) systemBars.bottom else v.paddingBottom,
+                if (left) maxOf(systemBars.left, displayCutout.left) else v.paddingLeft,
+                if (top) maxOf(systemBars.top, displayCutout.top) else v.paddingTop,
+                if (right) maxOf(systemBars.right, displayCutout.right) else v.paddingRight,
+                if (bottom) maxOf(systemBars.bottom, displayCutout.bottom) else v.paddingBottom,
             )
             insets
         }

app/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt

@@ -12,8 +12,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Handler
 import android.os.HandlerThread
-import android.os.ParcelUuid
 import dagger.hilt.android.qualifiers.ApplicationContext
+import eu.darken.capod.common.coroutine.AppScope
 import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.Bugs
 import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR
@@ -21,27 +21,38 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.flow.setupCommonEventHandlers
 import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.retryWhen
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import java.io.IOException
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class BluetoothManager2 @Inject constructor(
-    private val manager: BluetoothManager,
-    @ApplicationContext private val context: Context,
+    @AppScope private val appScope: CoroutineScope,
     private val dispatcherProvider: DispatcherProvider,
+    @ApplicationContext private val context: Context,
+    private val manager: BluetoothManager,
 ) {
 
     val adapter: BluetoothAdapter?
@@ -89,7 +100,7 @@ class BluetoothManager2 @Inject constructor(
 
             override fun onServiceDisconnected(profile: Int) {
                 log(TAG, WARN) { "onServiceDisconnected(profile=$profile)" }
-                close(IOException("BluetoothProfile service disconnected (profile=$profile)"))
+                close()  // Close gracefully without exception to prevent crash
             }
 
         }, profile)
@@ -103,59 +114,118 @@ class BluetoothManager2 @Inject constructor(
     }
 
 
-    private fun monitorDevicesForProfile(
+    private fun monitorProfile(
         profile: Int = BluetoothProfile.HEADSET
     ): Flow<Set<BluetoothDevice>> = getBluetoothProfile(profile).flatMapLatest { bluetoothProfile ->
         callbackFlow {
-            log(TAG, VERBOSE) { "connectedDevices(profile=$profile) starting" }
-            trySend(bluetoothProfile.connectedDevices)
+            log(TAG, VERBOSE) { "monitorProfile(): for profile=$profile starting" }
+
+            try {
+                trySend(bluetoothProfile.connectedDevices)
+            } catch (e: Exception) {
+                log(TAG, ERROR) { "monitorProfile(): Error querying initial connected devices: $e" }
+                close(e)
+                return@callbackFlow
+            }
 
             val filter = IntentFilter().apply {
-                addAction(BluetoothDevice.ACTION_ACL_CONNECTED)
-                addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED)
+                addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED)
             }
 
-            val handlerThread = HandlerThread("BluetoothEventReceiver").apply {
-                start()
-            }
+            val handlerThread = HandlerThread("BluetoothEventReceiver").apply { start() }
             val handler = Handler(handlerThread.looper)
 
             val receiver: BroadcastReceiver = object : BroadcastReceiver() {
                 override fun onReceive(context: Context, intent: Intent) {
-                    log(TAG, VERBOSE) { "Bluetooth event (intent=$intent, extras=${intent.extras})" }
-                    val action = intent.action
-                    if (action == null) {
-                        log(TAG, ERROR) { "Bluetooth event without action, how did we get this?" }
+                    log(TAG, VERBOSE) { "monitorProfile(): Bluetooth event (intent=$intent, extras=${intent.extras})" }
+
+                    if (intent.action == null) {
+                        log(TAG, ERROR) { "monitorProfile(): Bluetooth event without action?" }
                         return
                     }
                     val device = intent.getParcelableExtra<BluetoothDevice?>(BluetoothDevice.EXTRA_DEVICE)
                     if (device == null) {
-                        log(TAG, ERROR) { "Connection event is missing EXTRA_DEVICE: ${intent.extras}" }
+                        log(TAG, ERROR) { "monitorProfile(): Event is missing EXTRA_DEVICE" }
                         return
                     }
 
                     this@callbackFlow.launch {
-                        val currentDevices = bluetoothProfile.connectedDevices
+                        if (intent.action != BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED) {
+                            log(TAG, WARN) { "Unknown action: ${intent.action}" }
+                            return@launch
+                        }
 
-                        when (action) {
-                            BluetoothDevice.ACTION_ACL_CONNECTED -> {
-                                log(TAG) { "Adding $device to current devices $currentDevices" }
-                                trySend(currentDevices.plus(device))
+                        // Profile connection changed - query actual state from proxy
+                        val statePrevious = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, -1)
+                        log(TAG) { "monitorProfile(): HEADSET profile state changed for $device - previous: $statePrevious" }
+
+                        val stateNow = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1)
+                        log(TAG) { "monitorProfile(): HEADSET profile state changed for $device - now: $stateNow" }
+
+                        val currentDevices = try {
+                            bluetoothProfile.connectedDevices
+                        } catch (e: Exception) {
+                            log(TAG, ERROR) { "monitorProfile(): Error handling profile event: $e" }
+                            // Log but continue - don't kill the whole Flow for one bad event
+                            emptySet()
+                        }.toMutableSet()
+                        log(TAG) { "monitorProfile(): currentDevices: $currentDevices" }
+
+                        when (stateNow) {
+                            BluetoothProfile.STATE_CONNECTING -> {
+                                log(TAG) { "monitorProfile(): Currently connecting $device" }
                             }
 
-                            BluetoothDevice.ACTION_ACL_DISCONNECTED -> {
-                                log(TAG) { "Removing $device from current devices $currentDevices" }
-                                trySend(currentDevices.minus(device))
+                            BluetoothProfile.STATE_CONNECTED -> {
+                                log(TAG) { "monitorProfile(): Device has connected $device" }
+                                if (!currentDevices.contains(device)) {
+                                    log(
+                                        TAG,
+                                        VERBOSE
+                                    ) { "monitorProfile(): $device not in proxy yet, adding manually" }
+                                    currentDevices.add(device)
+                                }
+                                trySend(currentDevices)
+                            }
+
+                            BluetoothProfile.STATE_DISCONNECTING -> {
+                                log(TAG) { "monitorProfile(): Currently DISconnecting $device" }
+                            }
+
+                            BluetoothProfile.STATE_DISCONNECTED -> {
+                                log(TAG) { "monitorProfile(): Device has disconnected $device" }
+                                if (currentDevices.contains(device)) {
+                                    log(
+                                        TAG,
+                                        VERBOSE
+                                    ) { "monitorProfile(): $device still in proxy, removing manually" }
+                                    currentDevices.remove(device)
+                                }
+                                trySend(currentDevices)
                             }
                         }
                     }
                 }
             }
-            context.registerReceiver(receiver, filter, null, handler)
+
+            try {
+                context.registerReceiver(receiver, filter, null, handler)
+            } catch (e: Exception) {
+                log(TAG, ERROR) { "monitorProfile(): Failed to register receiver: $e" }
+                handlerThread.quitSafely()
+                close(e)
+                return@callbackFlow
+            }
 
             awaitClose {
-                log(TAG, VERBOSE) { "connectedDevices(profile=$profile) closed." }
-                context.unregisterReceiver(receiver)
+                log(TAG, VERBOSE) { "monitorProfile(): profile=$profile closed." }
+                try {
+                    context.unregisterReceiver(receiver)
+                } catch (e: Exception) {
+                    log(TAG, ERROR) { "monitorProfile(): Error unregistering receiver: $e" }
+                } finally {
+                    handlerThread.quitSafely()
+                }
             }
         }
     }
@@ -163,10 +233,11 @@ class BluetoothManager2 @Inject constructor(
     private val seenDevicesLock = Mutex()
     private val seenDevicesCache = mutableMapOf<String, Instant>()
 
-    fun connectedDevices(
-        featureFilter: Set<ParcelUuid> = ContinuityProtocol.BLE_FEATURE_UUIDS
-    ): Flow<List<BluetoothDevice2>> = isBluetoothEnabled
-        .flatMapLatest { monitorDevicesForProfile(BluetoothProfile.HEADSET) }
+    val connectedDevices: Flow<List<BluetoothDevice2>> = isBluetoothEnabled
+        .flatMapLatest { enabled ->
+            if (enabled) monitorProfile(BluetoothProfile.HEADSET)
+            else flowOf(emptySet())  // Return empty when Bluetooth is off
+        }
         .map { devices ->
             val currentAddresses = devices.map { it.address }
 
@@ -177,7 +248,9 @@ class BluetoothManager2 @Inject constructor(
             }
 
             devices
-                .filter { device -> featureFilter.any { feature -> device.hasFeature(feature) } }
+                .filter { device ->
+                    ContinuityProtocol.BLE_FEATURE_UUIDS.any { feature -> device.hasFeature(feature) }
+                }
                 .map { device ->
                     BluetoothDevice2(
                         internal = device,
@@ -189,6 +262,30 @@ class BluetoothManager2 @Inject constructor(
                     )
                 }
         }
+        .retryWhen { cause, attempt ->
+            log(TAG, WARN) { "connectedDevices Flow failed (attempt ${attempt + 1}): $cause" }
+            if (attempt < 3) {
+                delay(1000 * (attempt + 1))  // 1s, 2s, 3s exponential backoff
+                true  // Retry
+            } else {
+                false  // Give up after 3 attempts
+            }
+        }
+        .catch { e ->
+            log(TAG, ERROR) { "connectedDevices Flow failed after retries: $e" }
+            emit(emptyList())  // Emit empty list and complete gracefully
+        }
+        .distinctUntilChanged()
+        .setupCommonEventHandlers(TAG) { "connectedDevices" }
+        .stateIn(
+            scope = appScope + dispatcherProvider.IO,
+            started = SharingStarted.WhileSubscribed(
+                stopTimeoutMillis = 5_000L,
+                replayExpirationMillis = 0L,
+            ),
+            initialValue = null
+        )
+        .filterNotNull()
 
     fun bondedDevices(): Flow<Set<BluetoothDevice2>> = flow {
         val rawDevices = adapter?.bondedDevices ?: throw IllegalStateException("Bluetooth adapter unavailable")

app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt

@@ -5,7 +5,6 @@ import android.app.NotificationManager
 import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.media.AudioManager
-import androidx.work.WorkManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -30,11 +29,6 @@ class AndroidModule {
     fun bluetoothManager(context: Context): BluetoothManager =
         context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
 
-    @Provides
-    @Singleton
-    fun workerManager(context: Context): WorkManager =
-        WorkManager.getInstance(context)
-
     @Provides
     @Singleton
     fun audioManager(context: Context): AudioManager =

app/src/main/java/eu/darken/capod/common/flow/FlowCombineExtensions.kt

@@ -36,6 +36,27 @@ inline fun <T1, T2, T3, R> combine(
     )
 }
 
+@Suppress("UNCHECKED_CAST", "LongParameterList")
+inline fun <T1, T2, T3, T4, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    crossinline transform: suspend (T1, T2, T3, T4) -> R
+): Flow<R> = kotlinx.coroutines.flow.combine(
+    flow,
+    flow2,
+    flow3,
+    flow4,
+) { args: Array<*> ->
+    transform(
+        args[0] as T1,
+        args[1] as T2,
+        args[2] as T3,
+        args[3] as T4,
+    )
+}
+
 @Suppress("UNCHECKED_CAST", "LongParameterList")
 inline fun <T1, T2, T3, T4, T5, R> combine(
     flow: Flow<T1>,

app/src/main/java/eu/darken/capod/common/worker/WorkerExtensions.kt

@@ -1,31 +0,0 @@
-package eu.darken.capod.common.worker
-
-import android.os.Parcel
-import android.os.Parcelable
-import androidx.work.Data
-
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T : Parcelable> Data.getParcelable(key: String): T? {
-    val parcel = Parcel.obtain()
-    try {
-        val bytes = getByteArray(key) ?: return null
-        parcel.unmarshall(bytes, 0, bytes.size)
-        parcel.setDataPosition(0)
-        val creator = T::class.java.getField("CREATOR").get(null) as Parcelable.Creator<T>
-        return creator.createFromParcel(parcel)
-    } finally {
-        parcel.recycle()
-    }
-}
-
-
-fun Data.Builder.putParcelable(key: String, parcelable: Parcelable): Data.Builder {
-    val parcel = Parcel.obtain()
-    try {
-        parcelable.writeToParcel(parcel, 0)
-        putByteArray(key, parcel.marshall())
-    } finally {
-        parcel.recycle()
-    }
-    return this
-}

app/src/main/java/eu/darken/capod/main/ui/overview/OverviewFragmentVM.kt

@@ -90,7 +90,7 @@ class OverviewFragmentVM @Inject constructor(
 
             val shouldStartMonitor = when (generalSettings.monitorMode.value) {
                 MonitorMode.MANUAL -> false
-                MonitorMode.AUTOMATIC -> bluetoothManager.connectedDevices().first().isNotEmpty()
+                MonitorMode.AUTOMATIC -> bluetoothManager.connectedDevices.first().isNotEmpty()
                 MonitorMode.ALWAYS -> true
             }
             if (shouldStartMonitor) {

app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt

@@ -19,9 +19,7 @@ import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.firstSeenFormatted
 import eu.darken.capod.pods.core.getBatteryDrawable
-import eu.darken.capod.pods.core.getBatteryLevelCase
-import eu.darken.capod.pods.core.getBatteryLevelLeftPod
-import eu.darken.capod.pods.core.getBatteryLevelRightPod
+import eu.darken.capod.pods.core.formatBatteryPercent
 import eu.darken.capod.pods.core.lastSeenFormatted
 import java.time.Duration
 import java.time.Instant
@@ -76,11 +74,13 @@ class DualPodsCardVH(parent: ViewGroup) :
 
         // Pods battery state
         device.apply {
-            podLeftBatteryIcon.setImageResource(getBatteryDrawable(batteryLeftPodPercent))
-            podLeftBatteryLabel.text = getBatteryLevelLeftPod(context)
+            val leftPercent = batteryLeftPodPercent
+            podLeftBatteryIcon.setImageResource(getBatteryDrawable(leftPercent))
+            podLeftBatteryLabel.text = formatBatteryPercent(context, leftPercent)
 
-            podRightBatteryIcon.setImageResource(getBatteryDrawable(batteryRightPodPercent))
-            podRightBatteryLabel.text = getBatteryLevelRightPod(context)
+            val rightPercent = batteryRightPodPercent
+            podRightBatteryIcon.setImageResource(getBatteryDrawable(rightPercent))
+            podRightBatteryLabel.text = formatBatteryPercent(context, rightPercent)
         }
 
         // Pods charging state
@@ -139,8 +139,9 @@ class DualPodsCardVH(parent: ViewGroup) :
             if (this is HasCase) {
                 podCaseIcon.setImageResource(caseIcon)
                 podCaseBatteryIcon.isGone = false
-                podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
-                podCaseBatteryLabel.text = getBatteryLevelCase(context)
+                val casePercent = batteryCasePercent
+                podCaseBatteryIcon.setImageResource(getBatteryDrawable(casePercent))
+                podCaseBatteryLabel.text = formatBatteryPercent(context, casePercent)
 
                 podCaseChargingIcon.isInvisible = !isCaseCharging
                 podCaseChargingLabel.isInvisible = !isCaseCharging

app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt

@@ -13,7 +13,7 @@ import eu.darken.capod.pods.core.SinglePodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.firstSeenFormatted
 import eu.darken.capod.pods.core.getBatteryDrawable
-import eu.darken.capod.pods.core.getBatteryLevelHeadset
+import eu.darken.capod.pods.core.formatBatteryPercent
 import eu.darken.capod.pods.core.lastSeenFormatted
 import java.time.Duration
 import java.time.Instant
@@ -55,8 +55,9 @@ class SinglePodsCardVH(parent: ViewGroup) :
 
         // Battery level
         device.apply {
-            batteryLabel.text = getBatteryLevelHeadset(context)
-            batteryIcon.setImageResource(getBatteryDrawable(batteryHeadsetPercent))
+            val headsetPercent = batteryHeadsetPercent
+            batteryIcon.setImageResource(getBatteryDrawable(headsetPercent))
+            batteryLabel.text = formatBatteryPercent(context, headsetPercent)
         }
 
         // Charge state

app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationActivity.kt

@@ -1,12 +1,36 @@
 package eu.darken.capod.main.ui.widget
 
 import android.appwidget.AppWidgetManager
+import android.content.Context
 import android.content.Intent
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.Shader
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
+import android.text.Editable
+import android.text.InputFilter
+import android.text.TextWatcher
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.GridLayout
+import android.widget.ImageView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.drawable.toDrawable
+import androidx.core.graphics.toColorInt
 import androidx.core.view.isVisible
+import com.google.android.material.chip.Chip
 import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.R
 import eu.darken.capod.common.EdgeToEdgeHelper
 import eu.darken.capod.common.debug.logging.log
@@ -24,17 +48,19 @@ class WidgetConfigurationActivity : Activity2() {
 
     @Inject lateinit var profileAdapter: WidgetProfileSelectionAdapter
     @Inject lateinit var upgradeRepo: UpgradeRepo
+    @ApplicationContext @Inject lateinit var appContext: Context
 
     private var widgetId: Int = AppWidgetManager.INVALID_APPWIDGET_ID
 
+    private var isUpdatingHexFromCode = false
+    private val checkerboardDrawable: BitmapDrawable by lazy { createCheckerboardDrawable() }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
 
-        // Set result to CANCELED in case user backs out
         setResult(RESULT_CANCELED)
 
-        // Get widget ID from intent
         widgetId = intent.getIntExtra(
             AppWidgetManager.EXTRA_APPWIDGET_ID,
             AppWidgetManager.INVALID_APPWIDGET_ID
@@ -42,7 +68,6 @@ class WidgetConfigurationActivity : Activity2() {
 
         log(TAG) { "onCreate(widgetId=$widgetId)" }
 
-        // If widget ID is invalid, finish
         if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
             log(TAG) { "Invalid widget ID, finishing" }
             finish()
@@ -58,6 +83,15 @@ class WidgetConfigurationActivity : Activity2() {
 
         ui.profilesRecycler.adapter = profileAdapter
 
+        setupPreviewContainer()
+        setupPresetChips()
+        setupColorSwatches(ui.bgColorGrid, isBg = true)
+        setupColorSwatches(ui.fgColorGrid, isBg = false)
+        setupHexInput()
+        setupTransparencySlider()
+        setupShowDeviceLabelSwitch()
+        setupResetButton()
+
         ui.cancelButton.setOnClickListener {
             log(TAG) { "Cancel clicked" }
             finish()
@@ -92,6 +126,310 @@ class WidgetConfigurationActivity : Activity2() {
                 ui.confirmButton.text = getString(R.string.general_upgrade_action)
                 ui.confirmButton.isEnabled = true
             }
+
+            updatePresetChipSelection(state.activePreset)
+            updateCustomSectionsVisibility(state.isCustomMode)
+            updateSwatchSelection(ui.bgColorGrid, state.theme.backgroundColor)
+            updateSwatchSelection(ui.fgColorGrid, state.theme.foregroundColor)
+            updateHexInputs(state.theme)
+
+            // Disable transparency slider when using Material You (no custom bg to apply alpha to)
+            val hasCustomBg = state.theme.backgroundColor != null
+            ui.transparencySlider.isEnabled = hasCustomBg
+            ui.transparencyLabel.alpha = if (hasCustomBg) 1.0f else 0.5f
+
+            val transparencyPercent = ((255 - state.theme.backgroundAlpha) / 255f * 100f)
+            val displayPercent = (transparencyPercent / 5f).toInt() * 5
+            if (!ui.transparencySlider.isPressed) {
+                ui.transparencySlider.value = displayPercent.toFloat()
+            }
+            ui.transparencyLabel.text = getString(
+                R.string.widget_config_transparency_label
+            ) + if (hasCustomBg && displayPercent > 0) " ($displayPercent%)" else ""
+
+            ui.showDeviceLabelSwitch.isChecked = state.theme.showDeviceLabel
+
+            val selectedProfileLabel = state.profiles.firstOrNull { it.id == state.selectedProfile }?.label
+            val deviceLabel = ui.previewCard.findViewById<android.widget.TextView>(R.id.preview_device_label)
+            deviceLabel?.text = selectedProfileLabel ?: ""
+
+            updatePreview(state.theme)
+        }
+    }
+
+    private val widgetThemeContext: Context by lazy {
+        ContextThemeWrapper(this, com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight)
+    }
+
+    private fun resolveWidgetThemeColor(attr: Int): Int {
+        val typedArray = widgetThemeContext.theme.obtainStyledAttributes(intArrayOf(attr))
+        val color = typedArray.getColor(0, Color.BLACK)
+        typedArray.recycle()
+        return color
+    }
+
+    private fun setupPreviewContainer() {
+        // Initial background set from XML, updated dynamically in updatePreview
+    }
+
+    private fun updatePreview(theme: WidgetTheme) {
+        val previewRoot = ui.previewCard.findViewById<View>(R.id.preview_widget_root)
+
+        // Background color applied to the inner view, matching the real widget
+        val bgColor = theme.backgroundColor
+        if (bgColor != null) {
+            previewRoot.setBackgroundColor(WidgetTheme.applyAlpha(bgColor, theme.backgroundAlpha))
+        } else {
+            previewRoot.setBackgroundColor(resolveWidgetThemeColor(android.R.attr.colorBackground))
+        }
+
+        // Show checkerboard behind preview only when there's actual transparency to visualize
+        val hasTransparency = bgColor != null && theme.backgroundAlpha < 255
+        ui.previewContainer.background = if (hasTransparency) {
+            checkerboardDrawable
+        } else {
+            AppCompatResources.getDrawable(this, R.drawable.widget_preview_checkerboard)
+        }
+
+        // Foreground (text + icon colors)
+        val fgColor = theme.foregroundColor
+        val defaultTextColor = resolveWidgetThemeColor(android.R.attr.textColorPrimary)
+        val defaultIconColor = resolveWidgetThemeColor(android.R.attr.colorAccent)
+
+        val textViews = listOf(
+            R.id.preview_left_label,
+            R.id.preview_right_label,
+            R.id.preview_case_label,
+            R.id.preview_device_label,
+        )
+        val iconViews = listOf(
+            R.id.preview_left_icon,
+            R.id.preview_right_icon,
+            R.id.preview_case_icon,
+        )
+
+        for (id in textViews) {
+            val tv = ui.previewCard.findViewById<android.widget.TextView>(id) ?: continue
+            tv.setTextColor(fgColor ?: defaultTextColor)
+        }
+
+        for (id in iconViews) {
+            val iv = ui.previewCard.findViewById<ImageView>(id) ?: continue
+            if (fgColor != null) {
+                iv.setColorFilter(fgColor, PorterDuff.Mode.SRC_IN)
+            } else {
+                iv.setColorFilter(defaultIconColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+
+        // Device label visibility
+        val deviceLabel = ui.previewCard.findViewById<View>(R.id.preview_device_label)
+        deviceLabel?.isVisible = theme.showDeviceLabel
+    }
+
+    private fun createCheckerboardDrawable(): BitmapDrawable {
+        val cellSize = (8 * resources.displayMetrics.density).toInt()
+        val bitmap = createBitmap(cellSize * 2, cellSize * 2)
+        val canvas = Canvas(bitmap)
+        val paint = Paint()
+        // Light squares
+        paint.color = 0xFFE8E8E8.toInt()
+        canvas.drawRect(0f, 0f, (cellSize * 2).toFloat(), (cellSize * 2).toFloat(), paint)
+        // Dark squares
+        paint.color = 0xFFD0D0D0.toInt()
+        canvas.drawRect(0f, 0f, cellSize.toFloat(), cellSize.toFloat(), paint)
+        canvas.drawRect(
+            cellSize.toFloat(),
+            cellSize.toFloat(),
+            (cellSize * 2).toFloat(),
+            (cellSize * 2).toFloat(),
+            paint
+        )
+
+        return bitmap.toDrawable(resources).apply {
+            tileModeX = Shader.TileMode.REPEAT
+            tileModeY = Shader.TileMode.REPEAT
+        }
+    }
+
+    private fun setupPresetChips() {
+        val presetNames = mapOf(
+            WidgetTheme.Preset.MATERIAL_YOU to getString(R.string.widget_config_preset_material_you),
+            WidgetTheme.Preset.CLASSIC_DARK to getString(R.string.widget_config_preset_dark),
+            WidgetTheme.Preset.CLASSIC_LIGHT to getString(R.string.widget_config_preset_light),
+            WidgetTheme.Preset.BLUE to getString(R.string.widget_config_preset_blue),
+            WidgetTheme.Preset.GREEN to getString(R.string.widget_config_preset_green),
+            WidgetTheme.Preset.RED to getString(R.string.widget_config_preset_red),
+        )
+
+        for (preset in WidgetTheme.Preset.entries) {
+            val chip = Chip(this).apply {
+                text = presetNames[preset] ?: preset.name
+                isCheckable = true
+                tag = preset
+                setOnClickListener { vm.selectPreset(preset) }
+            }
+            ui.presetChipGroup.addView(chip)
+        }
+
+        // Custom chip
+        val customChip = Chip(this).apply {
+            text = getString(R.string.widget_config_custom_label)
+            isCheckable = true
+            tag = CUSTOM_CHIP_TAG
+            setOnClickListener {
+                val defaultBg = resolveWidgetThemeColor(android.R.attr.colorBackground)
+                val defaultFg = resolveWidgetThemeColor(android.R.attr.textColorPrimary)
+                vm.enterCustomMode(defaultBg, defaultFg)
+            }
+        }
+        ui.presetChipGroup.addView(customChip)
+    }
+
+    private fun updatePresetChipSelection(activePreset: WidgetTheme.Preset?) {
+        for (i in 0 until ui.presetChipGroup.childCount) {
+            val chip = ui.presetChipGroup.getChildAt(i) as? Chip ?: continue
+            chip.isChecked = if (activePreset != null) {
+                chip.tag == activePreset
+            } else {
+                chip.tag == CUSTOM_CHIP_TAG
+            }
+        }
+    }
+
+    private fun updateCustomSectionsVisibility(isCustomMode: Boolean) {
+        val visibility = if (isCustomMode) View.VISIBLE else View.GONE
+        ui.bgColorLabel.visibility = visibility
+        ui.bgColorGrid.visibility = visibility
+        ui.bgHexInputLayout.visibility = visibility
+        ui.fgColorLabel.visibility = visibility
+        ui.fgColorGrid.visibility = visibility
+        ui.fgHexInputLayout.visibility = visibility
+    }
+
+    private fun setupColorSwatches(grid: GridLayout, isBg: Boolean) {
+        for (color in SWATCH_COLORS) {
+            val itemView = LayoutInflater.from(this)
+                .inflate(R.layout.widget_color_swatch_item, grid, false)
+
+            val swatchColor = itemView.findViewById<View>(R.id.swatch_color)
+            val bgDrawable = swatchColor.background?.mutate() as? GradientDrawable ?: continue
+            bgDrawable.setColor(color)
+            swatchColor.background = bgDrawable
+
+            itemView.setOnClickListener {
+                ui.bgHexInput.clearFocus()
+                ui.fgHexInput.clearFocus()
+                if (isBg) vm.setBackgroundColor(color) else vm.setForegroundColor(color)
+            }
+
+            val params = GridLayout.LayoutParams(
+                GridLayout.spec(GridLayout.UNDEFINED),
+                GridLayout.spec(GridLayout.UNDEFINED, 1f),
+            ).apply {
+                width = GridLayout.LayoutParams.WRAP_CONTENT
+                height = GridLayout.LayoutParams.WRAP_CONTENT
+                setGravity(Gravity.CENTER)
+            }
+            grid.addView(itemView, params)
+        }
+    }
+
+    private fun updateSwatchSelection(grid: GridLayout, selectedColor: Int?) {
+        for (i in 0 until grid.childCount) {
+            val itemView = grid.getChildAt(i) as? FrameLayout ?: continue
+            val color = SWATCH_COLORS.getOrNull(i) ?: continue
+            val isSelected =
+                selectedColor != null && (selectedColor or 0xFF000000.toInt()) == (color or 0xFF000000.toInt())
+
+            itemView.findViewById<View>(R.id.swatch_selected_ring)?.isVisible = isSelected
+            itemView.findViewById<ImageView>(R.id.swatch_check)?.apply {
+                isVisible = isSelected
+                if (isSelected) {
+                    val checkColor = WidgetTheme.bestContrastForeground(color)
+                    setColorFilter(checkColor)
+                }
+            }
+        }
+    }
+
+    private fun setupHexInput() {
+        val hexFilter = InputFilter { source, _, _, _, _, _ ->
+            val filtered = source.toString().uppercase().filter { it in "0123456789ABCDEF" }
+            if (filtered == source.toString()) null else filtered
+        }
+
+        ui.bgHexInput.filters = arrayOf(hexFilter, InputFilter.LengthFilter(6))
+        ui.fgHexInput.filters = arrayOf(hexFilter, InputFilter.LengthFilter(6))
+
+        ui.bgHexInput.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable?) {
+                if (isUpdatingHexFromCode) return
+                val hex = s?.toString() ?: return
+                if (hex.length == 6) {
+                    try {
+                        val color = "#$hex".toColorInt()
+                        vm.setBackgroundColor(color)
+                    } catch (_: IllegalArgumentException) {
+                    }
+                }
+            }
+        })
+
+        ui.fgHexInput.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable?) {
+                if (isUpdatingHexFromCode) return
+                val hex = s?.toString() ?: return
+                if (hex.length == 6) {
+                    try {
+                        val color = "#$hex".toColorInt()
+                        vm.setForegroundColor(color)
+                    } catch (_: IllegalArgumentException) {
+                    }
+                }
+            }
+        })
+    }
+
+    private fun updateHexInputs(theme: WidgetTheme) {
+        isUpdatingHexFromCode = true
+        try {
+            val bgHex = theme.backgroundColor?.let { String.format("%06X", 0xFFFFFF and it) } ?: ""
+            if (ui.bgHexInput.text.toString() != bgHex && !ui.bgHexInput.hasFocus()) {
+                ui.bgHexInput.setText(bgHex)
+            }
+
+            val fgHex = theme.foregroundColor?.let { String.format("%06X", 0xFFFFFF and it) } ?: ""
+            if (ui.fgHexInput.text.toString() != fgHex && !ui.fgHexInput.hasFocus()) {
+                ui.fgHexInput.setText(fgHex)
+            }
+        } finally {
+            isUpdatingHexFromCode = false
+        }
+    }
+
+    private fun setupTransparencySlider() {
+        ui.transparencySlider.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) {
+                val alpha = 255 - (value / 100f * 255f).toInt()
+                vm.setBackgroundAlpha(alpha)
+            }
+        }
+    }
+
+    private fun setupShowDeviceLabelSwitch() {
+        ui.showDeviceLabelSwitch.setOnCheckedChangeListener { _, isChecked ->
+            vm.setShowDeviceLabel(isChecked)
+        }
+    }
+
+    private fun setupResetButton() {
+        ui.resetButton.setOnClickListener {
+            vm.resetToDefaults()
         }
     }
 
@@ -101,19 +439,46 @@ class WidgetConfigurationActivity : Activity2() {
         val resultValue = Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
         setResult(RESULT_OK, resultValue)
 
-        val appWidgetManager = AppWidgetManager.getInstance(this@WidgetConfigurationActivity)
+        val appWidgetManager = AppWidgetManager.getInstance(appContext)
 
         WidgetProvider.updateWidget(
-            context = this@WidgetConfigurationActivity,
+            context = appContext,
             appWidgetManager = appWidgetManager,
             widgetId = widgetId
         )
 
         finish()
-
     }
 
     companion object {
         private val TAG = logTag("Widget", "ConfigurationActivity")
+        private const val CUSTOM_CHIP_TAG = "custom"
+
+        private val SWATCH_COLORS = intArrayOf(
+            0xFFF44336.toInt(), // Red
+            0xFFE91E63.toInt(), // Pink
+            0xFF9C27B0.toInt(), // Purple
+            0xFF673AB7.toInt(), // Deep Purple
+            0xFF3F51B5.toInt(), // Indigo
+            0xFF2196F3.toInt(), // Blue
+            0xFF03A9F4.toInt(), // Light Blue
+            0xFF00BCD4.toInt(), // Cyan
+            0xFF009688.toInt(), // Teal
+            0xFF4CAF50.toInt(), // Green
+            0xFF8BC34A.toInt(), // Light Green
+            0xFFCDDC39.toInt(), // Lime
+            0xFFFFEB3B.toInt(), // Yellow
+            0xFFFFC107.toInt(), // Amber
+            0xFFFF9800.toInt(), // Orange
+            0xFFFF5722.toInt(), // Deep Orange
+            0xFF795548.toInt(), // Brown
+            0xFF9E9E9E.toInt(), // Grey
+            0xFF607D8B.toInt(), // Blue Grey
+            0xFFFFFFFF.toInt(), // White
+            0xFF1E1E1E.toInt(), // Near Black
+            0xFF37474F.toInt(), // Dark Blue Grey
+            0xFF1B5E20.toInt(), // Dark Green
+            0xFF0D47A1.toInt(), // Dark Blue
+        )
     }
-}
+}

app/src/main/java/eu/darken/capod/main/ui/widget/WidgetConfigurationViewModel.kt

@@ -1,8 +1,10 @@
 package eu.darken.capod.main.ui.widget
 
 import android.appwidget.AppWidgetManager
+import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
@@ -22,8 +24,11 @@ class WidgetConfigurationViewModel @Inject constructor(
     private val deviceProfilesRepo: DeviceProfilesRepo,
     private val widgetSettings: WidgetSettings,
     private val upgradeRepo: UpgradeRepo,
+    @ApplicationContext private val context: Context,
 ) : ViewModel3(dispatcherProvider) {
 
+    private val appWidgetManager by lazy { AppWidgetManager.getInstance(context) }
+
     val widgetId: Int
         get() = savedStateHandle.get<Int>(AppWidgetManager.EXTRA_APPWIDGET_ID) ?: AppWidgetManager.INVALID_APPWIDGET_ID
 
@@ -37,18 +42,32 @@ class WidgetConfigurationViewModel @Inject constructor(
 
     private val selectedProfile = MutableStateFlow(widgetSettings.getWidgetProfile(widgetId))
 
-    val state = combine(
+    private val initialTheme: WidgetTheme = run {
+        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) return@run WidgetTheme.DEFAULT
+        WidgetTheme.fromBundle(appWidgetManager.getAppWidgetOptions(widgetId))
+    }
+
+    private val forceCustomMode = MutableStateFlow(WidgetTheme.matchPreset(initialTheme) == null)
+
+    private val currentTheme = MutableStateFlow(initialTheme)
+
+    val state = eu.darken.capod.common.flow.combine(
         selectedProfile,
+        currentTheme,
+        forceCustomMode,
         deviceProfilesRepo.profiles,
         upgradeRepo.upgradeInfo,
-    ) { selected, profiles, upgradeInfo ->
-        log(TAG) { "loadProfiles()" }
-
+    ) { selected, theme, forceCustom, profiles, upgradeInfo ->
+        log(TAG) { "state update: profile=$selected, theme=$theme, forceCustom=$forceCustom" }
 
+        val activePreset = if (forceCustom) null else WidgetTheme.matchPreset(theme)
         State(
             profiles = profiles,
             isPro = upgradeInfo.isPro,
             selectedProfile = selected,
+            theme = theme,
+            activePreset = activePreset,
+            isCustomMode = activePreset == null,
         )
     }.asLiveData2()
 
@@ -56,13 +75,70 @@ class WidgetConfigurationViewModel @Inject constructor(
         val profiles: List<DeviceProfile> = emptyList(),
         val selectedProfile: ProfileId? = null,
         val isPro: Boolean = false,
+        val theme: WidgetTheme = WidgetTheme.DEFAULT,
+        val activePreset: WidgetTheme.Preset? = WidgetTheme.Preset.MATERIAL_YOU,
+        val isCustomMode: Boolean = false,
     ) {
         val canConfirm: Boolean = selectedProfile != null
     }
 
     fun selectProfile(profileId: ProfileId) {
         log(TAG) { "selectProfile(profileId=$profileId)" }
-        selectedProfile.value =  profileId
+        selectedProfile.value = profileId
+    }
+
+    fun selectPreset(preset: WidgetTheme.Preset) {
+        log(TAG) { "selectPreset(preset=$preset)" }
+        forceCustomMode.value = false
+        currentTheme.value = WidgetTheme(
+            backgroundColor = preset.presetBg,
+            foregroundColor = preset.presetFg,
+            backgroundAlpha = currentTheme.value.backgroundAlpha,
+            showDeviceLabel = currentTheme.value.showDeviceLabel,
+        )
+    }
+
+    fun enterCustomMode(resolvedBg: Int, resolvedFg: Int) {
+        log(TAG) { "enterCustomMode(resolvedBg=${String.format("#%06X", 0xFFFFFF and resolvedBg)}, resolvedFg=${String.format("#%06X", 0xFFFFFF and resolvedFg)})" }
+        forceCustomMode.value = true
+        // Populate null colors with the currently displayed values so the user has a starting point
+        val theme = currentTheme.value
+        currentTheme.value = theme.copy(
+            backgroundColor = theme.backgroundColor ?: (resolvedBg or 0xFF000000.toInt()),
+            foregroundColor = theme.foregroundColor ?: (resolvedFg or 0xFF000000.toInt()),
+        )
+    }
+
+    fun setBackgroundColor(color: Int) {
+        log(TAG) { "setBackgroundColor(color=${String.format("#%06X", 0xFFFFFF and color)})" }
+        currentTheme.value = currentTheme.value.copy(backgroundColor = color or 0xFF000000.toInt())
+    }
+
+    fun setForegroundColor(color: Int) {
+        log(TAG) { "setForegroundColor(color=${String.format("#%06X", 0xFFFFFF and color)})" }
+        currentTheme.value = currentTheme.value.copy(foregroundColor = color or 0xFF000000.toInt())
+    }
+
+    fun setBackgroundAlpha(alpha: Int) {
+        log(TAG) { "setBackgroundAlpha(alpha=$alpha)" }
+        currentTheme.value = currentTheme.value.copy(backgroundAlpha = alpha.coerceIn(0, 255))
+    }
+
+    fun toggleDeviceLabel() {
+        val newValue = !currentTheme.value.showDeviceLabel
+        log(TAG) { "toggleDeviceLabel(showDeviceLabel=$newValue)" }
+        currentTheme.value = currentTheme.value.copy(showDeviceLabel = newValue)
+    }
+
+    fun setShowDeviceLabel(show: Boolean) {
+        log(TAG) { "setShowDeviceLabel(show=$show)" }
+        currentTheme.value = currentTheme.value.copy(showDeviceLabel = show)
+    }
+
+    fun resetToDefaults() {
+        log(TAG) { "resetToDefaults()" }
+        forceCustomMode.value = false
+        currentTheme.value = WidgetTheme.DEFAULT
     }
 
     fun confirmSelection() {
@@ -71,9 +147,16 @@ class WidgetConfigurationViewModel @Inject constructor(
             log(TAG) { "confirmSelection(widgetId=$widgetId, selectedProfile=$selectedProfile)" }
             widgetSettings.saveWidgetProfile(widgetId, selectedProfile)
         }
+
+        // Save theme to AppWidgetOptions bundle
+        val theme = currentTheme.value
+        log(TAG) { "confirmSelection: saving theme=$theme" }
+        val options = appWidgetManager.getAppWidgetOptions(widgetId)
+        theme.toBundle(options)
+        appWidgetManager.updateAppWidgetOptions(widgetId, options)
     }
 
     companion object {
         private val TAG = logTag("Widget", "ConfigurationVM")
     }
-}
+}

app/src/main/java/eu/darken/capod/main/ui/widget/WidgetProvider.kt

@@ -5,10 +5,13 @@ import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.RemoteViews
 import androidx.annotation.LayoutRes
+import androidx.appcompat.view.ContextThemeWrapper
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.capod.R
 import eu.darken.capod.common.coroutine.AppScope
@@ -30,13 +33,12 @@ import eu.darken.capod.pods.core.HasEarDetectionDual
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.PodFactory
 import eu.darken.capod.pods.core.SinglePodDevice
+import eu.darken.capod.pods.core.formatBatteryPercent
 import eu.darken.capod.pods.core.getBatteryDrawable
-import eu.darken.capod.pods.core.getBatteryLevelCase
-import eu.darken.capod.pods.core.getBatteryLevelHeadset
-import eu.darken.capod.pods.core.getBatteryLevelLeftPod
-import eu.darken.capod.pods.core.getBatteryLevelRightPod
+import eu.darken.capod.profiles.core.DeviceProfilesRepo
 import eu.darken.capod.profiles.core.ProfileId
 import finish2
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
@@ -52,6 +54,7 @@ class WidgetProvider : AppWidgetProvider() {
     @Inject lateinit var podFactory: PodFactory
     @Inject lateinit var upgradeRepo: UpgradeRepo
     @Inject lateinit var widgetSettings: WidgetSettings
+    @Inject lateinit var deviceProfilesRepo: DeviceProfilesRepo
     @AppScope @Inject lateinit var appScope: CoroutineScope
 
     private fun executeAsync(
@@ -139,9 +142,15 @@ class WidgetProvider : AppWidgetProvider() {
         log(TAG) { "updateWidget(widgetId=$widgetId, profileId=$profileId options=$options)" }
 
         val device: PodDevice? = profileId?.let { podMonitor.getDeviceForProfile(it) }
+        val profileLabel: String? = profileId?.let { id ->
+            deviceProfilesRepo.profiles.first().firstOrNull { it.id == id }?.label
+        }
+
+        val theme = WidgetTheme.fromBundle(widgetManager.getAppWidgetOptions(widgetId))
+        log(TAG, VERBOSE) { "updateWidget: theme=$theme" }
 
         val layout = when {
-            !upgradeRepo.isPro() -> createUpgradeRequiredLayout(context)
+            !upgradeRepo.isPro() -> createUpgradeRequiredLayout(context, widgetId, theme)
             device is DualPodDevice -> {
                 val minWidth = widgetManager.getAppWidgetOptions(widgetId)
                     .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
@@ -157,23 +166,89 @@ class WidgetProvider : AppWidgetProvider() {
                     else -> R.layout.widget_pod_dual_wide_layout
                 }
 
-                createDualPodLayout(context, device, layout)
+                createDualPodLayout(context, device, layout, widgetId, theme, profileLabel)
             }
 
-            device is SinglePodDevice -> createSinglePodLayout(context, device)
-            device is PodDevice -> createUnknownPodLayout(context, device)
-            else -> createNoDeviceLayout(context, profileId != null)
+            device is SinglePodDevice -> createSinglePodLayout(context, device, widgetId, theme, profileLabel)
+            device is PodDevice -> createUnknownPodLayout(context, device, widgetId, theme)
+            else -> createNoDeviceLayout(context, profileId != null, widgetId, theme)
         }
         widgetManager.updateAppWidget(widgetId, layout)
     }
 
+    private fun applyThemeColors(
+        context: Context,
+        views: RemoteViews,
+        theme: WidgetTheme,
+        textViewIds: List<Int>,
+        iconViewIds: List<Int>,
+        hasDeviceLabel: Boolean,
+    ) {
+        // Always explicitly set background color to ensure previous custom colors are overwritten
+        val bgColor = theme.backgroundColor
+        if (bgColor != null) {
+            val colorWithAlpha = WidgetTheme.applyAlpha(bgColor, theme.backgroundAlpha)
+            views.setInt(R.id.widget_root, "setBackgroundColor", colorWithAlpha)
+        } else {
+            // Reset to theme default — resolve ?android:attr/colorBackground
+            val defaultBg = resolveThemeColor(context, android.R.attr.colorBackground)
+            views.setInt(R.id.widget_root, "setBackgroundColor", defaultBg)
+        }
+
+        // Always explicitly set text/icon colors
+        val fgColor = theme.foregroundColor
+        if (fgColor != null) {
+            for (textViewId in textViewIds) {
+                views.setTextColor(textViewId, fgColor)
+            }
+            for (iconViewId in iconViewIds) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    views.setColorStateList(iconViewId, "setImageTintList", ColorStateList.valueOf(fgColor))
+                } else {
+                    views.setInt(iconViewId, "setColorFilter", fgColor)
+                }
+            }
+        } else {
+            // Reset to theme defaults
+            val defaultTextColor = resolveThemeColor(context, android.R.attr.textColorPrimary)
+            val defaultIconColor = resolveThemeColor(context, android.R.attr.colorAccent)
+            for (textViewId in textViewIds) {
+                views.setTextColor(textViewId, defaultTextColor)
+            }
+            for (iconViewId in iconViewIds) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    views.setColorStateList(iconViewId, "setImageTintList", ColorStateList.valueOf(defaultIconColor))
+                } else {
+                    views.setInt(iconViewId, "setColorFilter", defaultIconColor)
+                }
+            }
+        }
+
+        if (hasDeviceLabel) {
+            views.setViewVisibility(
+                R.id.headphones_label,
+                if (theme.showDeviceLabel) View.VISIBLE else View.GONE
+            )
+        }
+    }
+
+    private fun resolveThemeColor(context: Context, attr: Int): Int {
+        val themedContext = ContextThemeWrapper(context, com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight)
+        val typedArray = themedContext.theme.obtainStyledAttributes(intArrayOf(attr))
+        val color = typedArray.getColor(0, android.graphics.Color.BLACK)
+        typedArray.recycle()
+        return color
+    }
+
     private suspend fun createUpgradeRequiredLayout(
-        context: Context
+        context: Context,
+        widgetId: Int,
+        theme: WidgetTheme,
     ) = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
         log(TAG, VERBOSE) { "createUpgradeRequiredLayout(context=$context)" }
         val pendingIntent: PendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            widgetId,
             Intent(context, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
@@ -183,16 +258,27 @@ class WidgetProvider : AppWidgetProvider() {
         setTextViewText(R.id.primary, context.getString(R.string.upgrade_capod_label))
         setTextViewText(R.id.secondary, context.getString(R.string.upgrade_capod_description))
         setViewVisibility(R.id.secondary, View.VISIBLE)
+
+        applyThemeColors(
+            context = context,
+            views = this,
+            theme = theme,
+            textViewIds = listOf(R.id.primary, R.id.secondary),
+            iconViewIds = emptyList(),
+            hasDeviceLabel = false,
+        )
     }
 
     private fun createUnknownPodLayout(
         context: Context,
         podDevice: PodDevice,
+        widgetId: Int,
+        theme: WidgetTheme,
     ): RemoteViews = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
         log(TAG, VERBOSE) { "createUnknownPodLayout(context=$context, podDevice=$podDevice)" }
         val pendingIntent: PendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            widgetId,
             Intent(context, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
@@ -200,16 +286,27 @@ class WidgetProvider : AppWidgetProvider() {
         setOnClickPendingIntent(R.id.widget_root, pendingIntent)
 
         setTextViewText(R.id.primary, context.getString(R.string.pods_unknown_label))
+
+        applyThemeColors(
+            context = context,
+            views = this,
+            theme = theme,
+            textViewIds = listOf(R.id.primary),
+            iconViewIds = emptyList(),
+            hasDeviceLabel = false,
+        )
     }
 
     private fun createNoDeviceLayout(
         context: Context,
-        hasConfiguredProfile: Boolean = false
+        hasConfiguredProfile: Boolean = false,
+        widgetId: Int,
+        theme: WidgetTheme,
     ): RemoteViews = RemoteViews(context.packageName, R.layout.widget_message_layout).apply {
         log(TAG, VERBOSE) { "createNoDeviceLayout(context=$context, hasConfiguredProfile=$hasConfiguredProfile)" }
         val pendingIntent: PendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            widgetId,
             Intent(context, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
@@ -222,28 +319,41 @@ class WidgetProvider : AppWidgetProvider() {
             R.string.overview_nomaindevice_label
         }
         setTextViewText(R.id.primary, context.getString(messageRes))
+
+        applyThemeColors(
+            context = context,
+            views = this,
+            theme = theme,
+            textViewIds = listOf(R.id.primary),
+            iconViewIds = emptyList(),
+            hasDeviceLabel = false,
+        )
     }
 
     private fun createDualPodLayout(
         context: Context,
         podDevice: DualPodDevice,
-        @LayoutRes layout: Int
+        @LayoutRes layout: Int,
+        widgetId: Int,
+        theme: WidgetTheme,
+        profileLabel: String?,
     ): RemoteViews = RemoteViews(context.packageName, layout).apply {
-        log(TAG, VERBOSE) { "createSinglePodLayout(context=$context, podDevice=$podDevice), layout=${layout}" }
+        log(TAG, VERBOSE) { "createDualPodLayout(context=$context, podDevice=$podDevice), layout=${layout}" }
         val pendingIntent: PendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            widgetId,
             Intent(context, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
         setOnClickPendingIntent(R.id.widget_root, pendingIntent)
 
-        setTextViewText(R.id.headphones_label, podDevice.getLabel(context))
+        setTextViewText(R.id.headphones_label, profileLabel ?: podDevice.getLabel(context))
 
         // Left
+        val leftPercent = podDevice.batteryLeftPodPercent
         setImageViewResource(R.id.pod_left_icon, podDevice.leftPodIcon)
-        setTextViewText(R.id.pod_left_label, podDevice.getBatteryLevelLeftPod(context))
+        setTextViewText(R.id.pod_left_label, formatBatteryPercent(context, leftPercent))
         setViewVisibility(
             R.id.pod_left_charging,
             if (podDevice is HasChargeDetectionDual && podDevice.isLeftPodCharging) View.VISIBLE else View.GONE
@@ -255,15 +365,17 @@ class WidgetProvider : AppWidgetProvider() {
 
         // Case
         (podDevice as? HasCase)?.let { setImageViewResource(R.id.pod_case_icon, it.caseIcon) }
-        setTextViewText(R.id.pod_case_label, (podDevice as? HasCase)?.getBatteryLevelCase(context))
+        val casePercent = (podDevice as? HasCase)?.batteryCasePercent
+        setTextViewText(R.id.pod_case_label, formatBatteryPercent(context, casePercent))
         setViewVisibility(
             R.id.pod_case_charging,
             if (podDevice is HasCase && podDevice.isCaseCharging) View.VISIBLE else View.GONE
         )
 
         // Right
+        val rightPercent = podDevice.batteryRightPodPercent
         setImageViewResource(R.id.pod_right_icon, podDevice.rightPodIcon)
-        setTextViewText(R.id.pod_right_label, podDevice.getBatteryLevelRightPod(context))
+        setTextViewText(R.id.pod_right_label, formatBatteryPercent(context, rightPercent))
         setViewVisibility(
             R.id.pod_right_charging,
             if (podDevice is HasChargeDetectionDual && podDevice.isRightPodCharging) View.VISIBLE else View.GONE
@@ -272,35 +384,80 @@ class WidgetProvider : AppWidgetProvider() {
             R.id.pod_right_ear,
             if (podDevice is HasEarDetectionDual && podDevice.isRightPodInEar) View.VISIBLE else View.GONE
         )
+
+        applyThemeColors(
+            context = context,
+            views = this,
+            theme = theme,
+            textViewIds = listOf(
+                R.id.headphones_label,
+                R.id.pod_left_label,
+                R.id.pod_right_label,
+                R.id.pod_case_label,
+            ),
+            iconViewIds = listOf(
+                R.id.pod_left_icon,
+                R.id.pod_left_charging,
+                R.id.pod_left_ear,
+                R.id.pod_case_icon,
+                R.id.pod_case_charging,
+                R.id.pod_right_icon,
+                R.id.pod_right_charging,
+                R.id.pod_right_ear,
+            ),
+            hasDeviceLabel = true,
+        )
     }
 
     private fun createSinglePodLayout(
         context: Context,
         podDevice: SinglePodDevice,
+        widgetId: Int,
+        theme: WidgetTheme,
+        profileLabel: String?,
     ): RemoteViews = RemoteViews(context.packageName, R.layout.widget_pod_single_layout).apply {
         log(TAG, VERBOSE) { "createSinglePodLayout(context=$context, podDevice=$podDevice)" }
         val pendingIntent: PendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            widgetId,
             Intent(context, MainActivity::class.java),
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
         setOnClickPendingIntent(R.id.widget_root, pendingIntent)
 
-        setTextViewText(R.id.headphones_label, podDevice.getLabel(context))
+        val headsetPercent = podDevice.batteryHeadsetPercent
+        setTextViewText(R.id.headphones_label, profileLabel ?: podDevice.getLabel(context))
         setImageViewResource(R.id.headphones_icon, podDevice.iconRes)
-        setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(podDevice.batteryHeadsetPercent))
-        setTextViewText(R.id.headphones_battery_label, podDevice.getBatteryLevelHeadset(context))
+        setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(headsetPercent))
+        setTextViewText(R.id.headphones_battery_label, formatBatteryPercent(context, headsetPercent))
 
         setViewVisibility(
             R.id.headphones_worn,
             if (podDevice is HasEarDetection && podDevice.isBeingWorn) View.VISIBLE else View.GONE
         )
 
-        if (this is HasChargeDetectionDual) {
-            setViewVisibility(R.id.headphones_charging, if (isHeadsetBeingCharged) View.VISIBLE else View.GONE)
-        }
+        setViewVisibility(
+            R.id.headphones_charging,
+            if (podDevice is HasChargeDetectionDual && podDevice.isHeadsetBeingCharged) View.VISIBLE else View.GONE
+        )
+
+        applyThemeColors(
+            context = context,
+            views = this,
+            theme = theme,
+            textViewIds = listOf(
+                R.id.headphones_label,
+                R.id.headphones_battery_label,
+            ),
+            iconViewIds = listOf(
+                R.id.headphones_icon,
+                R.id.headphones_battery_icon,
+                R.id.headphones_charging,
+                R.id.headphones_worn,
+            ),
+            hasDeviceLabel = true,
+        )
     }
 
     companion object {
@@ -314,4 +471,4 @@ class WidgetProvider : AppWidgetProvider() {
             context.sendBroadcast(intent)
         }
     }
-}
+}