Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ohuc/CaffeineHealth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.2.1
Choose a base ref
...
head repository: ohuc/CaffeineHealth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.2.2
Choose a head ref
  • 2 commits
  • 16 files changed
  • 2 contributors

Commits on May 26, 2026

  1. Implement weekly sleep rota and update version to 2.2.2-beta.1

    - Implement `WeeklySleepRotaSettingsScreen` to allow users to set custom bedtimes for specific days of the week.
    - Add "Weekly sleep rota" navigation and summary card to the Caffeine Profile settings.
    - Update `UserSettings` and `UserDateTimePreferences` to support day-specific sleep times in caffeine metabolism calculations.
    - Integrate weekly rota data into the backup and restore system via `BackupManager`.
    - Add DataStore persistence for weekly sleep schedule entries in `SettingsRepository`.
    - Fix minor formatting and indentation in `CaffeineDatabase`.
    - Increment `versionCode` to 7 and `versionName` to `2.2.2-beta.1`.
    ohuc committed May 26, 2026
    Configuration menu
    Copy the full SHA
    97c66b2 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2026

  1. Fix Health Connect two-way sync and bump version to v2.2.2-beta.2

    - Add name field to NutritionRecord so drinks show their actual name instead of generic 'Meal'
    - Use clientRecordId + clientRecordVersion for idempotent upserts (edits no longer duplicate in HC)
    - Propagate edits, deletes, duplicates, and Reset Today to Health Connect
    - Add READ_NUTRITION permission and import caffeine records from other apps (30-day window, deduplicated)
    - Widget quick-log now pushes to Health Connect
    - DB migration 9→10 adds healthConnectRecordId column to track imported records
    
    Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
    ohuc and claude committed May 27, 2026
    Configuration menu
    Copy the full SHA
    e5655a9 View commit details
    Browse the repository at this point in the history
Loading