chore(deps): update kotlin to v2.4.10

.forgejo/ISSUE_TEMPLATE/bug_report.md

@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Something doesn't work the way it should
-title: ""
-labels:
-  - bug
----
-
-### What happened
-
-
-### What you expected
-
-
-### Steps to reproduce
-1.
-2.
-3.
-
-### Environment
-- Calendula version: <!-- Settings → bottom of the screen -->
-- Android version:
-- Device:
-- Installed from: <!-- official F-Droid / the self-hosted repo / built from source -->
-- Affected calendar: <!-- Google, CalDAV (DAVx5, Nextcloud, …), on-device/local,
-                         subscribed/WebCal, birthdays — provider behaviour differs
-                         a lot per account type, so this often points straight at
-                         the cause -->
-- Time zone: <!-- only if the problem involves dates or all-day events -->
-

.forgejo/ISSUE_TEMPLATE/config.yml

@@ -1,18 +0,0 @@
-# Kept enabled so anything that doesn't fit the four templates still has a way
-# in (the `ToDo` label exists for exactly those).
-blank_issues_enabled: true
-
-contact_links:
-  - name: Translate Calendula
-    url: https://weblate.dev.jeanlucmakiola.de/engage/calendula/
-    about: >-
-      Translations are managed on Weblate, not here — it owns every values-*
-      file, so a hand-edited translation gets overwritten on the next sync.
-      No coding needed: pick or request a language and translate in the browser.
-
-  - name: Contributing guide
-    url: https://codeberg.org/jlmakiola/calendula/src/branch/main/CONTRIBUTING.md
-    about: >-
-      Before opening a pull request: the issue-first workflow, which release
-      branch to target, how to build (there's a submodule), and the
-      architectural rules a change is reviewed against.

.forgejo/PULL_REQUEST_TEMPLATE.md

@@ -1,41 +0,0 @@
-<!--
-Thanks for contributing to Calendula!
-
-Please skim CONTRIBUTING.md if you haven't:
-https://codeberg.org/jlmakiola/calendula/src/branch/main/CONTRIBUTING.md
-
-Two things it's easy to get wrong:
-  • Features need a discussed issue first — an undiscussed feature PR may be
-    closed unmerged even when the code is good.
-  • Target the release branch for your issue's milestone (milestone 2.18.0 →
-    release/v2.18.0), not main. If you targeted main, just say so below and it
-    will be retargeted.
--->
-
-### What this changes
-
-
-### Why
-
-<!-- Closes #123 — link the issue this implements or fixes. -->
-
-
-### How it was tested
-
-<!--
-Which of these ran green, and anything you exercised by hand. On-device notes
-are especially useful for UI changes.
-
-  ./gradlew lint test assembleDebug
-  python3 scripts/check_translations.py
--->
-
-
-### Checklist
-
-- [ ] There's an issue for this, and (for a feature) it got a go-ahead
-- [ ] Targeting the release branch for that issue's milestone — or `main`, noted above
-- [ ] `./gradlew lint test assembleDebug` passes locally
-- [ ] No `values-*/strings.xml` touched (Weblate owns those; new English strings in `values/` are fine)
-- [ ] `CHANGELOG.md` updated under `## [Unreleased]`, if the change is user-visible
-- [ ] No planning or design documents committed

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Something doesn't work the way it should
+title: ""
+labels:
+  - bug
+---
+
+### What happened
+
+
+### What you expected
+
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Environment
+- Calendula version: <!-- Settings → bottom of the screen -->
+- Android version:
+- Device:

.gitea/ISSUE_TEMPLATE/crash_report.md

@@ -5,7 +5,7 @@ title: "Crash: "
 labels:
   - bug
   - crash
-  - priority/high
+  - priority:high
 ---
 
 <!--

.gitea/workflows/ci.yaml

@@ -37,29 +37,14 @@ jobs:
       - name: Reproducible-release invariant
         run: bash scripts/check_reproducible_release.sh
 
-      # Decide whether anything that affects the app build changed. Docs, store
+      # Decide whether anything that affects the app build changed. Docs,
-      # metadata, licence texts and forge housekeeping don't, so those PRs skip
+      # F-Droid metadata and the licence don't, so those PRs skip the SDK +
-      # the SDK + Gradle work below but still report a green `ci`.
+      # Gradle work below but still report a green `ci`.
       - name: Classify change scope
         id: scope
-        env:
-          # Deliberately a skip-list, not a build-list: a path nobody thought
-          # about defaults to building. Only paths the Gradle build provably
-          # never reads belong here — note that the workflows themselves, the
-          # `.gitmodules` submodule pointer and `scripts/` are *not* in it.
-          SKIP_RE: '(\.md$|^docs/|^fastlane/|^fdroid-metadata/|^licenses/|^\.planning/|^\.(forgejo|gitea)/ISSUE_TEMPLATE/|^\.editorconfig$|^\.gitattributes$|^\.gitignore$|^renovate\.json5$|^LICENSE$)'
         run: |
           set -e
           BASE="${{ github.base_ref }}"
-          # Normally the bare branch name; tolerate a full ref, which would
-          # otherwise make the merge-base lookup fail and quietly degrade this
-          # guard into "always build".
-          BASE="${BASE#refs/heads/}"
-          if [ -z "$BASE" ]; then
-            echo "No base branch on this event — running the full build to be safe."
-            echo "code=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
           # Full (not --depth=1) base fetch so the merge-base is present even when
           # the PR branch forked several commits back; a shallow tip has no merge
           # base with a divergent branch and `git diff base...HEAD` aborts.
@@ -73,15 +58,11 @@ jobs:
           fi
           CHANGED=$(git diff --name-only "$MB" HEAD)
           echo "Changed files:"; echo "$CHANGED"
-          RELEVANT=$(echo "$CHANGED" | grep -vE "$SKIP_RE" || true)
+          if echo "$CHANGED" | grep -vE '(\.md$|^docs/|^fdroid-metadata/|^fastlane/|^LICENSE$)' | grep -q .; then
-          if [ -n "$RELEVANT" ]; then
-            # Naming them makes "why did my docs PR build for four minutes?"
-            # answerable from the log alone.
-            echo "Build-relevant changes:"; echo "$RELEVANT"
             echo "code=true" >> "$GITHUB_OUTPUT"
           else
-            echo "Docs/metadata-only change — skipping the Android build."
             echo "code=false" >> "$GITHUB_OUTPUT"
+            echo "Docs/metadata-only change — skipping the Android build."
           fi
 
       - name: Setup Java
@@ -91,14 +72,9 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
 
-      # Fully qualified on purpose. Codeberg resolves bare `uses:` refs against
-      # data.forgejo.org, Forgejo's own action mirror — actions/checkout,
-      # setup-java and cache all exist there, but android-actions/setup-android
-      # does not, and the job dies with "repository not found". Gitea's instance
-      # defaults to GitHub, which is why this never surfaced before the split.
       - name: Setup Android SDK
         if: steps.scope.outputs.code == 'true'
-        uses: https://github.com/android-actions/setup-android@v3
+        uses: android-actions/setup-android@v3
         with:
           # Default ("tools platform-tools") drags in the Android Emulator
           # (~300 MB) which the build never uses.

.gitea/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Release — F-Droid repo + Gitea/Codeberg release + Play
+name: Release — F-Droid repo + Gitea/Codeberg release
 
 # A release is cut by merging a release branch into main with a bumped
 # versionName (see docs/RELEASING.md). This workflow reads that versionName and,
@@ -9,12 +9,6 @@ name: Release — F-Droid repo + Gitea/Codeberg release + Play
 # trigger. Ordinary merges (no version bump) fall through `detect` and do
 # nothing.
 #
-# A trailing `play` job then uploads the App Bundle to Google Play. It is last
-# and separate because Play is the only channel that can reject a good build for
-# reasons the pipeline can't see, and that must not endanger a release which has
-# already shipped to F-Droid and Codeberg. It skips cleanly until the
-# PLAY_SERVICE_ACCOUNT_JSON secret exists.
-#
 # A manual workflow_dispatch (from a branch) runs the re-sign-only recovery
 # path: it re-signs the existing F-Droid index with the repo key and re-uploads,
 # without building an APK or creating a release. Used for key rotation / repo
@@ -33,14 +27,6 @@ jobs:
   # whether this push actually cuts a new release (no tag for it yet). Keeps the
   # heavy job from running on every merge to main.
   detect:
-    # Gitea only. The workflow directory split already keeps this file invisible
-    # to Codeberg — Forgejo's lookup is first-match-wins, and .forgejo/workflows
-    # exists — but that only holds while .forgejo/ is non-empty. Move the last
-    # file out of it and Codeberg would fall back to .gitea/workflows and start
-    # running the release pipeline on the contributor-facing runner, with no
-    # secrets. repository_owner differs between the two forges regardless of
-    # URL, proxy or instance rename, so this closes it permanently.
-    if: github.repository_owner == 'makiolaj'
     runs-on: docker
     outputs:
       is_release: ${{ steps.v.outputs.is_release }}
@@ -55,16 +41,8 @@ jobs:
       - name: Resolve version and whether it is a new release
         id: v
         env:
-          # Tags are read from Codeberg, which is canonical — deliberately NOT
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # from the Gitea API this workflow runs on. The Codeberg -> Gitea sync
+          API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
-          # is a push mirror, i.e. `git push --mirror`, which deletes refs the
-          # source does not have. A tag minted here on Gitea is therefore wiped
-          # by the next sync (Codeberg does not have it yet) and only reappears
-          # once the tag push at the end of this workflow propagates back.
-          # Asking Gitea inside that window would report "no tag" for a release
-          # that already shipped, and cut it a second time.
-          # Public repo, so this read needs no token.
-          TAG_API: https://codeberg.org/api/v1/repos/jlmakiola/calendula
         run: |
           set -e
           VERSION=$(grep -oP 'versionName\s*=\s*"\K[^"]+' app/build.gradle.kts)
@@ -82,28 +60,15 @@ jobs:
           fi
           # A tag for this version already existing means the release shipped on
           # an earlier push; do nothing. Absent => this merge cuts the release.
-          #
+          STATUS=$(curl -s -o /dev/null -w '%{http_code}' \
-          # Anything other than a clean 200/404 is treated as fatal rather than
+            -H "Authorization: token $TOKEN" "$API/git/refs/tags/v$VERSION")
-          # as "no tag". A Codeberg outage or a network blip would otherwise
+          if [ "$STATUS" = "200" ]; then
-          # read as absent and re-cut a release that has already shipped —
+            echo "Tag v$VERSION already exists — nothing to release."
-          # republishing to F-Droid and Play. Failing here is recoverable; a
-          # duplicate release is not.
-          STATUS=$(curl -s -o /dev/null -w '%{http_code}' "$TAG_API/git/refs/tags/v$VERSION" || echo 000)
-          case "$STATUS" in
-            200)
-              echo "Tag v$VERSION already exists on Codeberg — nothing to release."
             echo "is_release=false" >> "$GITHUB_OUTPUT"
-              ;;
+          else
-            404)
+            echo "No tag for v$VERSION yet — cutting the release."
-              echo "No tag for v$VERSION on Codeberg yet — cutting the release."
             echo "is_release=true" >> "$GITHUB_OUTPUT"
-              ;;
+          fi
-            *)
-              echo "Codeberg tag lookup for v$VERSION returned HTTP $STATUS." >&2
-              echo "Refusing to guess: treating this as 'no tag' could re-cut a shipped release." >&2
-              exit 1
-              ;;
-          esac
 
   # Releases: build + sign + publish, then mint the tag and Gitea release.
   # Also runs on manual dispatch, where it skips the build and just re-signs and
@@ -264,10 +229,9 @@ jobs:
           cp app/build/outputs/apk/release/app-release.apk "fdroid/repo/calendula_v${VERSION}.apk"
 
       # Per-version "What's New": ensure this version's changelog exists in the
-      # fastlane tree. The committed hand-written summary (kept under Play's
+      # fastlane tree (committed at release-cut time for the official repo; this
-      # 500-char cap) is used as-is; only if it is missing does the script fall
+      # regenerates it from CHANGELOG.md so the self-hosted repo never depends on
-      # back to CHANGELOG.md, so the self-hosted repo never depends on the
+      # the commit having happened). The transform below then carries it across.
-      # commit having happened. The transform below then carries it across.
       - name: Ensure this version's changelog is in the fastlane tree
         if: env.IS_RELEASE == 'true'
         run: bash scripts/sync_changelog_to_fastlane.sh
@@ -448,31 +412,20 @@ jobs:
               "prerelease": False,
           }))
           PY
-          # Create (or update) the release. Codeberg 500s on a POST/GET against a
+          # Upsert (re-run safe). POST also creates the tag at target_commitish
-          # tag it has only just received — the release request outruns the
+          # if the push mirror hasn't synced it yet.
-          # indexing of the ref we pushed a moment ago — so a single attempt kept
+          ID=$(curl -s -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | jq -r '.id // empty')
-          # failing and skipping the mirror even though the very same call
+          if [ -n "$ID" ]; then
-          # succeeds seconds later. Retry with backoff, and PATCH in place if a
-          # release already exists (re-run safe). A 5xx body still exits curl 0,
-          # so the loop, not `set -e`, controls the flow.
-          ID=""
-          for attempt in 1 2 3 4 5 6; do
-            EXIST=$(curl -s -H "Authorization: token $TOKEN" "$API/releases/tags/$TAG" | jq -r '.id // empty' 2>/dev/null || true)
-            if [ -n "$EXIST" ]; then
             curl -s -o /dev/null -w "release PATCH HTTP %{http_code}\n" -X PATCH \
               -H "Authorization: token $TOKEN" -H "Content-Type: application/json" \
-                -d @cb-payload.json "$API/releases/$EXIST"
+              -d @cb-payload.json "$API/releases/$ID"
-              ID="$EXIST"; break
+          else
-            fi
+            curl -s -o cb-response.json -w "release POST HTTP %{http_code}\n" -X POST \
-            CODE=$(curl -s -o cb-response.json -w "%{http_code}" -X POST \
               -H "Authorization: token $TOKEN" -H "Content-Type: application/json" \
-              -d @cb-payload.json "$API/releases")
+              -d @cb-payload.json "$API/releases"
-            echo "release POST attempt $attempt HTTP $CODE"
             ID=$(jq -r '.id // empty' cb-response.json 2>/dev/null || true)
-            [ -n "$ID" ] && break
+          fi
-            sleep $((attempt * 10))
+          if [ -z "$ID" ]; then echo "Could not resolve Codeberg release id." >&2; exit 1; fi
-          done
-          if [ -z "$ID" ]; then echo "Could not resolve Codeberg release id after retries." >&2; exit 1; fi
 
           # Attach APK + checksum, replacing any prior asset of the same name.
           for A in "$ASSET_APK" "$ASSET_SUM"; do
@@ -484,172 +437,3 @@ jobs:
               "$API/releases/$ID/assets?name=$A" -o /dev/null -w "asset $A HTTP %{http_code}\n"
           done
           echo "Published $TAG to Codeberg."
-
-      # Play takes an App Bundle, not the APK, so it is a second artifact from
-      # the same source and the same signing config — not a repackage of the
-      # APK. The release key signs it, but Play only ever treats that key as the
-      # *upload* key: Play App Signing re-signs with Google's own key before
-      # delivery. A Play install and an F-Droid install therefore carry
-      # different signatures and cannot update each other. That divergence is a
-      # deliberate, documented choice (docs/RELEASING.md), not an accident.
-      #
-      # Built LAST and `continue-on-error`, both deliberately: everything above
-      # has already shipped by this point, and nothing Play-related may put that
-      # at risk. Sitting mid-job without continue-on-error, this block took the
-      # whole 2.17.0 release down with it — no F-Droid publish, no tag, no
-      # Codeberg mirror — over an artifact upload. A failure here now costs the
-      # Play upload and nothing else.
-      #
-      # Nothing here touches the F-Droid path: the AAB is never copied into the
-      # repo, never attached to a release, and its build cannot change the APK
-      # published above.
-      #
-      # AGP embeds the R8 mapping in the bundle's BUNDLE-METADATA, so Play gets
-      # deobfuscated stacktraces without a separate mapping upload.
-      - name: Build release AAB
-        if: env.IS_RELEASE == 'true'
-        continue-on-error: true
-        run: ./gradlew bundleRelease
-
-      # NOT actions/upload-artifact@v4: it runs @actions/artifact v2, which
-      # refuses to start whenever GITHUB_SERVER_URL is not github.com — it reads
-      # any other forge as an unsupported GHES instance and fails before it ever
-      # talks to the server (go-gitea/gitea#36024). Gitea 1.25 serves the v4
-      # artifact API fine; only the client-side check is wrong. This fork is that
-      # client with the check removed. Pinned to a commit, not the v4 branch: a
-      # third-party action in the signing pipeline must not change under us.
-      - name: Hand the AAB to the Play job
-        if: env.IS_RELEASE == 'true'
-        continue-on-error: true
-        uses: https://github.com/ChristopherHX/gitea-upload-artifact@81f940d004763f986ba3582c007fd842dd5cb0d7 # v4
-        with:
-          name: release-aab-${{ needs.detect.outputs.version }}
-          path: app/build/outputs/bundle/release/app-release.aab
-          if-no-files-found: error
-          retention-days: 14
-
-  # Google Play channel.
-  #
-  # A separate job, on purpose, running only AFTER the F-Droid publish and both
-  # forge releases have completed. Play is the one channel that can reject a
-  # perfectly good build for reasons outside the pipeline (listing rules, policy
-  # review, API outage, a track that needs manual promotion). Isolating it means
-  # such a rejection surfaces as one red job next to a release that already
-  # shipped everywhere else, instead of failing the workflow that publishes it.
-  #
-  # Not a `container:` job even though a fastlane image exists: act_runner does
-  # not provide node inside custom job containers, so JavaScript actions
-  # (checkout, download-artifact) can't run there. The Renovate job gets away
-  # with a container because its only step is a shell command. Ruby is installed
-  # the same way sshpass, jq and fdroidserver are in the job above.
-  play:
-    needs: [detect, release]
-    # workflow_dispatch is the F-Droid re-sign recovery path — it must never
-    # touch Play, so gate on a real release only.
-    if: needs.detect.outputs.is_release == 'true'
-    runs-on: docker
-    env:
-      VERSION: ${{ needs.detect.outputs.version }}
-      VERSION_CODE: ${{ needs.detect.outputs.version_code }}
-      # Where the bundle lands. `internal` by default so a release reaches
-      # testers rather than the public, and promotion to production stays a
-      # deliberate human action in the Play Console — the same posture as
-      # holding UI releases for on-device review. Override with the PLAY_TRACK
-      # repo variable once the flow is trusted.
-      PLAY_TRACK: ${{ vars.PLAY_TRACK || 'internal' }}
-      PLAY_RELEASE_STATUS: ${{ vars.PLAY_RELEASE_STATUS || 'completed' }}
-      # Set PLAY_DRY_RUN=true to validate the edit against the API and discard
-      # it instead of committing — used to rehearse the first upload.
-      PLAY_DRY_RUN: ${{ vars.PLAY_DRY_RUN || 'false' }}
-      BUNDLE_PATH: vendor/bundle
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Skip cleanly (not fatally) when Play isn't configured yet, so the rest
-      # of the release pipeline keeps working during setup — same contract as
-      # the Codeberg mirror step.
-      - name: Write the Play service-account key
-        id: key
-        env:
-          PLAY_SERVICE_ACCOUNT_JSON: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
-        run: |
-          set -euo pipefail
-          if [ -z "${PLAY_SERVICE_ACCOUNT_JSON:-}" ]; then
-            echo "PLAY_SERVICE_ACCOUNT_JSON not set — skipping the Play upload."
-            echo "configured=false" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          printf '%s' "$PLAY_SERVICE_ACCOUNT_JSON" > play-service-account.json
-          # Fail here, with a clear message, rather than inside fastlane: a
-          # mangled multi-line secret is the likeliest setup mistake.
-          python3 -c "import json,sys; d=json.load(open('play-service-account.json')); sys.exit(0 if d.get('type')=='service_account' else 1)" \
-            || { echo "PLAY_SERVICE_ACCOUNT_JSON is not a valid service-account JSON." >&2; exit 1; }
-          echo "configured=true" >> "$GITHUB_OUTPUT"
-
-      # Same GHES-detection problem as the upload side, same fix — see the
-      # handoff step in the release job.
-      - name: Download the AAB
-        if: steps.key.outputs.configured == 'true'
-        uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # v4
-        with:
-          name: release-aab-${{ needs.detect.outputs.version }}
-          path: dist
-
-      - name: Install Ruby
-        if: steps.key.outputs.configured == 'true'
-        run: |
-          set -euo pipefail
-          SUDO=""
-          if command -v sudo >/dev/null 2>&1; then SUDO="sudo"; fi
-          $SUDO apt-get update
-          # ruby-dev + build-essential: several of fastlane's dependencies build
-          # native extensions.
-          $SUDO apt-get install -y ruby-full ruby-dev build-essential
-          ruby -v
-
-      # Only the first release pays the full gem build; afterwards this restores.
-      - name: Cache bundled gems
-        if: steps.key.outputs.configured == 'true'
-        uses: actions/cache@v4
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      - name: Install fastlane
-        if: steps.key.outputs.configured == 'true'
-        run: |
-          set -euo pipefail
-          gem install bundler --no-document
-          bundle config set --local path vendor/bundle
-          bundle install --jobs 4
-          bundle exec fastlane --version
-
-      - name: Upload to Play
-        if: steps.key.outputs.configured == 'true'
-        env:
-          SUPPLY_JSON_KEY: play-service-account.json
-          # supply is chatty on a TTY-less runner otherwise.
-          FASTLANE_SKIP_UPDATE_CHECK: '1'
-          FASTLANE_HIDE_CHANGELOG: '1'
-        run: |
-          set -euo pipefail
-          AAB="$GITHUB_WORKSPACE/dist/app-release.aab"
-          # Absolute, because a lane body runs from fastlane/, not the
-          # workspace root — a relative path resolves against the wrong
-          # directory there and 2.17.1 died on exactly that.
-          test -f "$AAB" || { echo "No AAB at $AAB — the artifact handoff failed." >&2; ls -la dist || true; exit 1; }
-          bundle exec fastlane deploy \
-            aab:"$AAB" \
-            track:"$PLAY_TRACK" \
-            release_status:"$PLAY_RELEASE_STATUS" \
-            dry_run:"$PLAY_DRY_RUN"
-          echo "Uploaded $VERSION (code $VERSION_CODE) to the '$PLAY_TRACK' track."
-
-      # The workspace is reused between runs on a self-hosted runner, so the
-      # credential must not outlive the job.
-      - name: Shred the service-account key
-        if: always()
-        run: shred -u play-service-account.json 2>/dev/null || rm -f play-service-account.json

.gitea/workflows/renovate.yml

@@ -29,30 +29,14 @@ jobs:
       - name: Run Renovate
         run: renovate
         env:
-          # Renovate targets Codeberg (canonical) while still RUNNING on the
+          # Self-hosted Gitea, not github.com.
-          # Gitea runner. Moving the job to Codeberg would put a repo-write
+          RENOVATE_PLATFORM: gitea
-          # token on the contributor-facing runner, which is exactly what the
+          RENOVATE_ENDPOINT: https://gitea.jeanlucmakiola.de/api/v1
-          # .forgejo/ vs .gitea/ split exists to prevent — so the token stays
+          # Bot-account token (Gitea secret). Needs repo read/write + PR scope.
-          # where the other secrets live and only the API calls cross over.
-          #
-          # Platform is `forgejo`, not `gitea`: Codeberg runs Forgejo, and the
-          # pinned image ships a distinct forgejo platform module.
-          RENOVATE_PLATFORM: forgejo
-          RENOVATE_ENDPOINT: https://codeberg.org/api/v1
-          # Codeberg bot-account token (Gitea secret). Needs repo read/write +
-          # PR scope on jlmakiola/calendula.
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           # Scope to this repo only — no org-wide autodiscovery.
           RENOVATE_AUTODISCOVER: 'false'
-          RENOVATE_REPOSITORIES: '["jlmakiola/calendula"]'
+          RENOVATE_REPOSITORIES: '["makiolaj/calendula"]'
-          # Commits/PRs authored as the bot, not a real maintainer. This address
+          # Commits/PRs authored as the bot, not a real maintainer.
-          # must be a verified email on the Codeberg bot account, otherwise the
-          # commits show up unattributed there.
           RENOVATE_GIT_AUTHOR: 'Renovate Bot <renovate@jeanlucmakiola.de>'
-          # Read-only github.com PAT (no scopes needed). Unaffected by the forge
-          # move — nearly every dependency is *released* on GitHub, and without
-          # this,
-          # changelog/release-note lookups hit the 60/h anonymous rate limit
-          # and PRs arrive with an empty "Release Notes" section.
-          RENOVATE_GITHUB_COM_TOKEN: ${{ secrets.GITHUB_COM_TOKEN }}
           LOG_LEVEL: info

.gitignore

@@ -50,27 +50,11 @@ google-services.json
 .DS_Store
 Thumbs.db
 
-# Editor swap/backup files
-*.swp
-*.swo
-*~
-
 # F-Droid local artifacts (the pipeline generates them in CI)
 /fdroid/
 
 # KSP
 .ksp/
 
-# Google Play Developer API service-account key. Reconstructed in CI from the
-# PLAY_SERVICE_ACCOUNT_JSON secret and shredded afterwards — never committed.
-/play-service-account.json
-
-# fastlane (Play uploader only — see fastlane/Fastfile)
-/fastlane/report.xml
-/fastlane/README.md
-/vendor/bundle/
-/.bundle/
-Gemfile.lock
-
 # Claude Code
 /CLAUDE.md

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "floret-kit"]
 	path = floret-kit
-	url = https://codeberg.org/jlmakiola/floret-kit.git
+	url = https://gitea.jeanlucmakiola.de/makiolaj/floret-kit.git

.planning/PROJECT.md

@@ -17,10 +17,9 @@ re-inventing the calendar sync stack — leave that to DAVx5 and the system.
 ## Current Milestone
 
 Milestones 1 (read, v1.0) and 2 (write support, v1.1–v2.0.0 incl. reminder
-delivery) are **complete** — v2.0.0 shipped 2026-06-11. Everything since is
+delivery) are **complete** — v2.0.0 shipped 2026-06-11. Next is v3.0
-tracked as issues and milestones on Codeberg:
+(power-user features) plus an undecided "Locations & People" idea backlog;
-<https://codeberg.org/jlmakiola/calendula/milestones>. A milestone maps to its
+see `ROADMAP.md`.
-`release/vX.Y.Z` branch.
 
 ## Stack
 
@@ -28,26 +27,10 @@ Kotlin 2.3.21 (paired with KSP 2.3.9 — Kotlin 2.4.0 has no KSP release
 yet, do not upgrade until one ships). Jetpack Compose + Material 3
 Expressive 1.5.0-alpha21 (alpha is intentional — Expressive APIs only
 live in the 1.5 alpha line). Hilt 2.59.2, DataStore. Gradle Kotlin DSL
-with Version Catalog. AGP 9.2.1, Gradle 9.5.1. JVM target 17 (exactly — AGP
+with Version Catalog. AGP 9.1.1, Gradle 9.5.1. JVM target 17.
-requires it).
 
-The shared Material 3 Expressive kit, **floret-kit**, is a git submodule wired
+Android-only (minSdk 29, targetSdk 36). No iOS. No `INTERNET` permission —
-in as a Gradle composite build, so it compiles from source rather than resolving
+any feature that would need one is an explicit product decision first.
-as a dependency.
-
-## Constraints
-
-- **Platform:** Android-only, Android 10+ (minSdk 29), targetSdk 36. No iOS.
-- **Offline-first:** all data lives in `CalendarContract` — no app database, no
-  sync stack. No `INTERNET` permission; any feature needing one is an explicit
-  product decision first.
-- **Privacy:** zero telemetry, zero analytics.
-- **i18n:** German + English from day one; further languages come from community
-  translators via the self-hosted Weblate, which owns every `values-*` file.
-- **Tests + CI from day one**, JVM-first.
-- **Reproducible release builds**, so the official F-Droid repo can verify the
-  published binary against a from-source rebuild.
-- **Licence:** MIT.
 
 ## Naming
 
@@ -57,9 +40,5 @@ shows a stylized "1" on a slate squircle.
 
 ## Source
 
-**Codeberg (`jlmakiola/calendula`) is canonical** — git, issues, PRs, tags and
+Hosted on self-hosted Gitea, released through self-hosted F-Droid repo on
-releases, plus contributor CI. The self-hosted Gitea instance is build
+Hetzner. Same infrastructure as `HouseHoldKeaper`.
-infrastructure only: it holds the signing key, runs the release pipeline, and
-publishes the self-hosted F-Droid repo on Hetzner. Codeberg push-mirrors `main`
-and tags to Gitea, where a bumped `versionName` triggers the release. Also
-published to the official F-Droid repo. See `docs/RELEASING.md`.

.planning/REQUIREMENTS.md

@@ -0,0 +1,53 @@
+# Calendula — Requirements
+
+See full design spec: `docs/superpowers/specs/2026-06-08-calendar-app-design.md`
+
+## V1 Scope (Variant "B") — shipped in full (v1.0.0, 2026-06-11)
+
+- [x] Foundation & CI infrastructure — v0.1.0 (2026-06-08)
+- [x] Data Layer over `CalendarContract`
+- [x] Permission flow (`READ_CALENDAR`)
+- [x] Month view (S1)
+- [x] Week view (S2)
+- [x] Day view (S3)
+- [x] Event Detail Sheet (S4) — became a full screen, plus full event read (v0.6)
+- [x] Multi-Calendar Filter (M3)
+- [x] Today button (M2) — shipped v0.5; Jump-to-Date **cut from scope**
+- [x] View-Switcher (M1)
+- [x] Settings screen (M4)
+- [x] Empty / no-permission / no-calendars states
+- [x] German + English localization
+- [x] Loading/Failure/Success states per screen (architectural pattern)
+
+## V2 Scope — write support, shipped in full (v2.0.0, 2026-06-11)
+
+- [x] Write foundation: `WRITE_CALENDAR`, read-only-calendar detection, delete (v1.1)
+- [x] Create event: form, FAB, last-used calendar (v1.2; polish v1.2.1)
+- [x] Edit event: shared form, scoped recurring writes, recurrence picker (v1.3)
+- [x] Reminder notifications (v1.4) — **reversal of the original
+  "system handles reminders" assumption:** Calendula targets
+  sole-calendar-app users, so it posts reminder notifications itself
+  (Etar model), incl. `POST_NOTIFICATIONS` onboarding
+- [x] Conflict dialog on save + store polish (v2.0)
+- Quick-add — **cut from scope** (the prefilled form covers it)
+- Calendar switching while editing — moved to v3 backlog
+
+### Out of Scope (V3+)
+
+- Home-screen widget
+- Full-text search
+- Tablet/foldable-specific layouts
+- Locations & People ideas (contact picker, OSM autocomplete) — see
+  `ROADMAP.md` idea backlog, undecided
+- iOS support (Android-only by design)
+
+## Constraints
+
+- **Tech stack:** Kotlin + Jetpack Compose + Material 3 Expressive, Hilt, DataStore
+- **Tech stack pin:** Hilt 2.59.2 + KSP 2.3.9; Kotlin 2.3.21 (KSP for Kotlin 2.4.0 not released yet). Material 3 pinned to `1.5.0-alpha21` (Expressive APIs only exist in alpha). Re-evaluate when KSP/Material3 stable land.
+- **Platform:** Android 10+ (API 29 minimum), Android 16 (API 36) target
+- **Offline-first:** all data lives in `CalendarContract`; no app-side network
+- **Privacy:** zero telemetry, no analytics
+- **i18n:** German + English from day one
+- **Tests + CI from day one**
+- **License:** MIT

.planning/ROADMAP.md

@@ -0,0 +1,587 @@
+# Calendula — Roadmap
+
+## v0.x — Pre-Release
+
+| Version | Milestone | Status |
+|---|---|---|
+| v0.1 | Foundation & CI | complete |
+| v0.2 | Data Layer & Permission Flow | complete |
+| v0.3 | Month + Week + Day views, view switcher | complete |
+| v0.4 | Event Detail (S4) + humanized recurrence | complete |
+| v0.5 | Calendar filter (M3) + Settings (M4) | complete |
+| v0.6 | Full event read — surface every readable field | complete |
+| v1.0 | First public release — polish pass, F-Droid | complete |
+
+Delivery ran ahead of the original table: Day view (S3) shipped in v0.3 and
+Event Detail (S4) in v0.4, so the Filter/Settings milestone became v0.5.
+
+Jump-to-date (the date-picker half of M2) was **cut from scope** and will not
+ship. The "Today" half of M2 already shipped in v0.5 (drawer entry).
+
+## v0.6 — Full event read
+
+Round out the read-only model so a detail view shows everything the system
+actually stores, before write support starts. Scope = `CalendarContract`
+columns we don't yet read/display:
+
+- **Reminders** (`VALARM`) — read `CalendarContract.Reminders`, list lead times
+- **Status** — Confirmed / Tentative / Cancelled (cancelled shown struck-through)
+- **Availability** (`TRANSP`) — Free / Busy chip
+- **Attendee extras** — role (required / optional / organizer) + the user's own
+  `SELF_ATTENDEE_STATUS`
+- **Timezone** (`EVENT_TIMEZONE`) — shown only when it differs from the device zone
+- **URL** — ~~tappable link card~~ **cut**: `CalendarContract` exposes no
+  `Events.URL` column (only `CUSTOM_APP_URI`, an originating-app deep-link).
+  URLs are instead surfaced by linkifying the description text
+- **Access level / class** (private / confidential) — small chip (optional, trivial)
+
+All of the above shipped in v0.6.0 (2026-06-11).
+
+Deliberately out of v0.6:
+- Recurrence exception / modified-occurrence badges — `Instances` already
+  resolves correct per-occurrence times for display; this only matters for
+  editing, so it folds into v2
+- `CATEGORIES`, `ATTACH` — not reliably exposed by `CalendarContract`
+  (provider limitation, not our choice)
+
+## v1.0 — First Public Release — shipped 2026-06-11
+
+All V1 features shipped, polished, on F-Droid. Read-only calendar. Cut directly
+after v0.6 (full event read) plus the onboarding-screen polish pass.
+
+### Polish backlog (pre-1.0)
+- ~~Redesign the initial grant-access (permission) screen~~ — **done**
+  (Material 3 Expressive onboarding, shipped in v0.6.0 / v1.0.0)
+
+## v2.0 — Write Support (complete, shipped 2026-06-11)
+
+Delivered in four releasable slices (plan:
+`docs/superpowers/plans/2026-06-11-03-write-support.md`). The V1 spec is a
+guide here, not a contract — scope per slice is decided as we go.
+
+| Version | Milestone | Status |
+|---|---|---|
+| v1.1 | Write foundation — `WRITE_CALENDAR`, read-only-calendar detection, delete (series + single occurrence) | complete (shipped 2026-06-11) |
+| v1.2 | Create event — form, FAB, last-used-calendar preselect | complete (shipped 2026-06-11) |
+| v1.2.1 | Form polish after on-device review — card design system, optional fields + settings defaults, OptionCard dialogs, expressive motion | complete (shipped 2026-06-11) |
+| v1.3 | Edit event — shared form, scoped recurring writes (this / following / all), recurrence picker | complete (shipped 2026-06-11) |
+| v1.4 | Reminder notifications — see below | complete (shipped 2026-06-11) |
+| v2.0 | Conflict dialog, polish pass (store copy refresh, F-Droid screenshots), release | complete (shipped 2026-06-11) |
+
+v2.0 scope was re-cut on 2026-06-11, after v1.4:
+- **Occurrence edit** already shipped early, in v1.3.
+- **Quick-add** is **cut from scope**: the full form already opens prefilled
+  (visible day, last-used calendar, optional fields hidden), so the sheet
+  would only save one screen transition while adding a second create-surface
+  to maintain. Revisit only if real-world feedback says creation feels heavy.
+- **Calendar switching while editing** moves to the v3 backlog (sync-adapter
+  minefield: `CALENDAR_ID` is sync-adapter-owned, AOSP locks the field; an
+  honest implementation is copy+delete like Google Calendar, with sync-identity
+  and attendee side effects).
+- **Conflict dialog** stays (plan 03, decision 5): on save, compare against
+  the row as it was when the form loaded; on external change, ask
+  overwrite / discard. Closes the silent-clobber gap on synced calendars.
+
+## v1.4 — Reminder Notifications
+
+**Essential**, not nice-to-have: Calendula targets users for whom it is their
+*only* calendar app, so reminder delivery can't be delegated to Google/OEM
+Calendar. The calendar provider schedules reminders and broadcasts
+`android.intent.action.EVENT_REMINDER`, but it does **not** post the visible
+notification — a calendar app must. We become that app (the Etar model).
+
+Scope:
+- Manifest-registered `BroadcastReceiver` for `EVENT_REMINDER`
+  (data scheme `content://com.android.calendar`) — wakes us at reminder time,
+  no foreground service.
+- Read `CalendarContract.CalendarAlerts` / `Reminders`, filter to
+  `METHOD_ALERT` / `METHOD_DEFAULT` (skip `METHOD_EMAIL`); post on a dedicated
+  notification channel; tap opens event detail.
+- `POST_NOTIFICATIONS` runtime permission (API 33+) — requested in onboarding.
+- Onboarding step: (a) request `POST_NOTIFICATIONS`, (b) in-app reminders
+  toggle, **default ON**, with copy warning that a second calendar app with
+  notifications on will cause duplicate reminders. Mirrored into Settings
+  (reversible).
+
+Deliberately deferred (add only if needed):
+- Snooze / dismiss notification actions (Etar has them)
+- Battery-optimization exemption prompt for delivery reliability
+
+## v2.1 — Month event grid + drawer view tabs (shipped 2026-06-15)
+
+- Month grid shows real events as continuous multi-day bars (not just dots)
+- View section in the navigation drawer to switch Month / Week / Day
+- Fix: text cursor no longer jumps in event text fields
+
+## v2.2 — Tap-to-create + local calendar management (shipped 2026-06-16)
+
+- Tap an empty slot in day/week → create form prefilled with that day + the
+  tapped hour (snapped to the hour, 1 h long)
+- Local (device-only) calendar management in a full-screen editor from
+  Settings → Calendars: create / rename / recolor / delete, with name,
+  pastel-previewed colour, and description (stored in `CAL_SYNC1`)
+- Synced calendars listed read-only, grouped by account, each with a
+  per-account "manage in source app" deep-link (resolved from the account's
+  authenticator — DAVx5/ICSx5/…) + an add-account shortcut
+- Shared `InlineTextField` extracted to `ui.common` (event form + calendar
+  editor share one input style)
+
+## v2.3 — Material 3 grouped-list redesign (shipped 2026-06-16)
+
+A structural + visual pass adopting one shared blueprint (modelled on the ReFra
+gallery app) across Settings, the calendar manager and the navigation drawer.
+
+- Shared `ui/common/GroupedList.kt`: `CollapsingScaffold` (a `LargeTopAppBar`
+  whose title collapses on scroll) + `GroupedRow` (Position-based corner
+  grouping, press-animated corners, `selected` + `minHeight` knobs).
+- Settings: category hub with About card on top and sliding sub-pages
+  (Appearance / New event form / Notifications); theme/week-start/language
+  pickers moved from `DropdownMenu` to OptionCard dialogs; token-based icon
+  chips; `ic_gitea.xml` for the About "Source" button.
+- Calendar manager + drawer restyled to match; shared `CalendarColorChip`;
+  drawer scrolls as one with the active view highlighted.
+- Cards use `surfaceContainerHigh` for readable contrast.
+- Donate button on the About card deferred (target TBD).
+
+---
+
+# Backlog (theme-based, post-v2.1)
+
+The old v3.0 / "daily-driver polish" / "Locations & People" lists are
+consolidated here by theme. Within a group, **(in progress)** /
+**(next)** mark what is being or about to be worked; everything else is an
+approved-but-unscheduled idea unless tagged **(idea)** /
+**(go/no-go)** / **(rejected)**. Order across groups is not a commitment.
+
+## Near-term sequence (ranked, 2026-06-16)
+
+The theme groups below are the full menu; this is the committed *order* for
+the next stretch. Ranking favours finishing the current create/edit + calendar
+arc before opening new fronts, then cheap-relative-to-value items and ones that
+unblock a later item. Order is a plan, not a contract — revisit after each lands.
+
+**Tier 1 — finish the current arc (create/edit + calendars)**
+1. Tap-to-create in day/week *(shipped v2.2.0)* — prefilled create from an empty slot
+2. Local calendar management + "manage in source app" deep-links *(shipped v2.2.0)*
+3. ~~Settings redesign & restructure~~ *(shipped v2.3.0 — grew into the full
+   grouped-list blueprint across Settings + calendars + drawer; see "v2.3"
+   above)*
+4. ~~Per-event color~~ *(shipped v2.4.0)* — palette calendars write
+   `EVENT_COLOR_KEY` (sync-safe); local/opted-in calendars write a raw
+   `EVENT_COLOR`; off-by-default setting for no-palette synced calendars
+Tier 1's create/edit + calendars arc is effectively closed. **Duplicate event**
+was deprioritised (2026-06-17) as low-importance and dropped to the bottom of
+the sequence; the next item is now **Jump-to-date** (formerly Tier 2).
+
+(Tier 2+ numbering below shifts accordingly; ranking unchanged.)
+
+### Settings redesign & restructure *(shipped v2.3.0)*
+
+The original scope below is kept as a record; the implementation expanded from a
+sub-screen restructure into the shared grouped-list blueprint (see "v2.3" above).
+
+The settings screen has grown into a flat vertical scroll of divider-separated
+sections (Appearance, Event form, Notifications, Calendars, Language, About) and
+will keep accreting rows (per-event-color defaults, default reminder, more
+calendar entries are all queued). It needs structure before it gets unwieldy.
+
+**Decided (2026-06-16): sub-screens**, not flat-but-carded. The top level
+becomes a category list; each category opens its own destination. More
+M3-idiomatic for a settings surface that will keep growing, and it mirrors the
+existing Calendars row, which already navigates out to its own screen.
+
+Structure — top-level settings list → category destinations:
+- **Appearance** → theme, dynamic colour, week start
+- **Event form** → the 6 default-field toggles + the hint text
+- **Notifications** → reminders toggle (POST_NOTIFICATIONS flow stays)
+- **Calendars** → already its own screen (`CalendarsScreen`); just becomes a
+  peer category row, no change to that screen
+- **Language** → single control; keep as a top-level row that opens an
+  OptionCard directly (a whole sub-screen for one choice is overkill)
+- **About** → kept inline on the top-level list as a card (read-only info,
+  not worth a navigation hop). Card layout, top → bottom:
+  - **Identity** — app logo + name "Calendula", with "by Jean-Luc Makiola"
+    as a subtitle beneath the name
+  - **Action buttons** (small, button-styled, sit in a row):
+    - **Source** — Gitea logo, opens the repo (`about_source_url`)
+    - **License** — opens the LICENSE file on Gitea
+    - **Donate** *(tentative)* — sits next to Source; target TBD (decide
+      before building: Liberapay / Ko-fi / Gitea sponsor / etc.)
+  - **Version** — small version number at the bottom of the card
+
+Scope:
+- **Navigation** — add the settings sub-screen destinations alongside the
+  existing settings/calendars routes in `CalendarHost`; back pops to the
+  settings list (mind the existing `BackHandler` that guards against falling
+  through to the activity).
+- **Fix the dialog-pattern violation** — theme, week-start and language use
+  `DropdownMenu`; the project default is the full-width tonal OptionCard modal
+  (radio/dropdown/text-list dialogs are banned, see
+  `option-card-modal-style-default`). Migrate these selectors to OptionCard.
+- **Visual pass** — top-level category rows with leading icons; consistent
+  spacing and row affordances aligned with the event-form card design system.
+
+Out of scope (no new settings *features* here) — this is a structure + style
+pass on the existing controls; new toggles ride in with their own features.
+
+**Tier 2 — navigation & daily-driver completeness**
+5. ~~Jump-to-date — drawer date picker (un-cut from V1); cheap, fills the nav gap~~ *(done, v2.5.0)*
+6. ~~Agenda view — the missing 4th view; serves daily-driver users *and* becomes the data source for the widget~~ *(done, v2.5.0)*
+
+**Tier 3 — platform reach (depends on Tier 2)**
+7. ~~Home-screen widget — built on the agenda data source from #6~~ *(done, v2.5.0 — agenda + month widgets)*
+8. App shortcuts: ~~launcher long-press → New event~~ *(done, v2.5.0)*; ~~quick-settings tile~~ *(done, v2.8.0 — "New event" QS tile)*
+
+**Tier 4 — reliability, data-safety & interop** *(re-ranked 2026-06-17)*
+9. **Reminders — defaults + delivery reliability** *(shipped v2.6.0)* — global
+   default reminder **+ per-calendar override**, bundled with battery-exemption
+   hardening. Full sketch in "Reminders — defaults & delivery reliability" below.
+10. **The `.ics` engine — export + import** *(shipped v2.7.0, 2026-06-18)* — one
+    hand-rolled serializer/parser (zero deps, stays on `kotlinx-datetime`),
+    four surfaces all shipped: single-event share + whole-calendar backup
+    (export), open-`.ics`→form + whole-calendar bulk import (import). Closed the
+    device-local-calendar data-loss gap (#10/#11 merged here). Built as two
+    sequential branches: `feat/ics-export` (write side + UID-on-create precursor)
+    then `feat/ics-import` (parser, restore, dedup by UID). Import is
+    liberal-in/strict-out: skip-and-report foreign `VTIMEZONE` / `RECURRENCE-ID`
+    / guest lists it can't model. Plans:
+    `docs/superpowers/plans/2026-06-18-05-ics-export.md` + `…-06-ics-import.md`.
+11. **Snooze / dismiss notification actions** *(merged into release/v2.8.0)* —
+    followed the `.ics` work; inherits v2.6's deferred exact-alarm/WorkManager
+    decision (snooze must re-fire an alarm).
+
+**Tier 5 — close the read/write gap on the event model** *(opened 2026-06-22)*
+12. **Attendee editing** *(shipped — merged into release/v2.8.0, `feat/attendee-editing`
+    MR !29 / commit `b0f34ff`, 2026-06-22)* — closed the last big read-only gap in
+    the event model: attendees were already *read* (queried, mapped, shown on the
+    detail screen since v0.6) and are now *writable* from the form. An attendees
+    section on `EventEditScreen` / `EventForm` adds by typed email **or** the
+    no-permission contact picker, edits/removes rows, and sets role (required /
+    optional) — writing `CalendarContract.Attendees` rows on insert + dirty-checked
+    update, mirroring the reminders-diff pattern. The sync-adapter *invitation*
+    caveat was **settled record-only** (Calendula never sends invites; the backend
+    decides delivery) — full sketch + decision in "Attendee editing" under Locations
+    & People below.
+
+**Gated — explicit go/no-go before any work (mostly INTERNET-permission calls)**
+- Remote calendar create/edit (re-implements DAVx5; INTERNET + credential storage)
+- Locations & People — the no-permission contact pickers already shipped (location v2.8.0, attendee email v2.8.0); what remains gated is OSM autocomplete (needs INTERNET)
+- Move event to another calendar — sync-adapter minefield (copy+delete model)
+
+**Bottom — deprioritised, not important**
+- Duplicate event (detail action → prefilled create form) — moved here
+  2026-06-17; cheap but low value, pick up only if asked
+
+**Unranked / fill-in** — pinch-to-zoom time scale, tablet/foldable layouts.
+Pulled in opportunistically, not sequenced.
+
+Tier 4 is now fully shipped (#9 reminders defaults v2.6.0, #10 `.ics`
+export/import v2.7.0, #11 snooze/dismiss in release/v2.8.0; drag-drop rejected),
+and Tier 5 #12 — attendee editing — shipped in release/v2.8.0, closing the last
+read-only gap in the event model. v2.8.0 also cleared most Tier 2/3 leftovers —
+full-text search, the "New event" Quick Settings tile, and the now-line all
+shipped there. **No tier work is currently committed as next;** the remaining
+candidates are unscheduled theme-group ideas (pinch-to-zoom, tablet/foldable,
+accessibility pass) plus the gated go/no-go items.
+
+## Navigation & views
+
+- ~~Tap an empty slot in day/week → create form prefilled with that
+  date+time, snapped to the hour~~ **shipped v2.2.0** (long-press variant
+  not added — single tap covers it)
+- Agenda view (fourth view: upcoming events grouped by day; also the
+  natural data source for a future widget)
+- Jump to date — drawer date picker (un-cut from V1)
+- ~~Current-time "now" line in day/week~~ **shipped v2.8.0**
+- Week numbers in the **month** grid — **rejected** (owner decision): clutters
+  the view and shrinks the day cells; the badge stays week-view-only.
+- Pinch-to-zoom time scale in day/week
+- Tablet / foldable layouts *(was v3.0)*
+- ~~Full-text search~~ **shipped v2.8.0** — for a daily driver with real event
+  history, finding an event is core completeness, not optional.
+
+## Event editing & creation
+
+- Duplicate event (detail action → prefilled create form)
+- ~~**Per-event color**~~ *(shipped v2.4.0)* — `EVENT_COLOR` / `EVENT_COLOR_KEY`
+  from the calendar's color list (`Colors` table, `TYPE_EVENT`), OptionCard
+  picker in the form, falling back to the calendar color when unset. Reused the
+  color-picker component and palette plumbing from local calendar management and
+  finished the create/edit theme.
+
+## Calendars & accounts
+
+- ~~Create / manage local (device-only) calendars~~ **shipped v2.2.0** —
+  name + color + description; rename / recolor / delete the calendars the app
+  owns. Inserted under `ACCOUNT_TYPE_LOCAL` as a sync adapter; description in
+  `CAL_SYNC1`. Full-screen "Calendars" editor reached from Settings.
+- ~~Per-calendar "manage in source app" deep-link~~ **shipped v2.2.0** — for
+  synced calendars, open the app the calendar actually came from based on
+  its `ACCOUNT_TYPE` (DAVx5 `bitfire.at.davdroid`, Google `com.google`,
+  …); fall back to system account/sync settings. Plus an "add account"
+  entry into system Accounts. Honest boundary for remote calendars.
+- **Remote calendar create/edit** *(go/no-go)* — creating a CalDAV
+  collection (`MKCALENDAR`) or a Google calendar means an in-app sync
+  client: **INTERNET permission, credential storage, the full server
+  round-trip** — i.e. re-implementing DAVx5. DAVx5 exposes no public
+  intent to delegate the create to it. Cosmetic local edits (color/name)
+  to an existing synced row are possible but don't propagate to the server
+  and may be overwritten on next sync — not promised. Same explicit
+  go/no-go gate as the OSM/INTERNET item below.
+- Move event to another calendar (copy+delete model with a consequences
+  warning — deferred from v2.0; `CALENDAR_ID` is sync-adapter-owned) *(was v3.0)*
+- ~~**Local-calendar backup / export** *(Tier 4 #10)*~~ **shipped v2.7.0** —
+  device-only (`ACCOUNT_TYPE_LOCAL`) calendars had no sync and therefore no
+  backup. Settings → Calendars → Export writes every event to a user-chosen
+  `.ics` file (SAF); restore is the bulk-import path (pick a calendar, dedup by
+  UID). Closed the silent data-loss gap.
+
+### Disable a calendar in-app *(captured 2026-06-25)*
+
+A second, heavier visibility level **above** the existing per-view filter. Today
+the drawer's calendar filter (`hiddenCalendarIds` in `CalendarPrefs`) only hides
+a calendar's *events* from the month/week/day/agenda views — the calendar itself
+still clutters the drawer filter list, the event-form calendar picker, and the
+import target picker. "Disable" removes a calendar from the app's surfaces
+entirely; "hide" stays the lightweight, frequently-toggled control.
+
+**Two-level model (both kept):**
+- **Hidden** (existing) — `hiddenCalendarIds`; a quick per-view checkbox in the
+  drawer. Toggles events on/off in the views; the calendar stays listed
+  everywhere. Operates only over the *enabled* calendars.
+- **Disabled** (new) — the calendar is gone from the app: not in the drawer
+  filter list, not in the event-form picker, not in the import picker, and its
+  events never appear (it's gated out of `instances()` like a hidden one). It
+  remains visible **only** in Settings → Calendars, where the enable/disable
+  toggle lives, so it can be brought back.
+
+**Storage — app-side (DataStore), mirrors the hidden set.** Add
+`disabledCalendarIds: Set<Long>` + `setDisabledCalendarIds(...)` to
+`CalendarPrefs` (comma-separated string key, same shape as `hiddenCalendarIds`).
+**Does not touch** `CalendarContract.Calendars.VISIBLE` / `SYNC_EVENTS` — purely
+a Calendula-local preference, so other calendar apps are unaffected and the sync
+adapters stay out of it (privacy-clean, reversible).
+
+**Where the disabled set is applied:**
+- `CalendarRepositoryImpl.instances()` + `searchEvents()` — exclude
+  `calendarId ∈ (hidden ∪ disabled)` so a disabled calendar's events never show
+  and aren't searchable. (`repository.calendars()` itself stays unfiltered/raw —
+  the screens that need everything still get everything.)
+- `FilterViewModel.state` — drop disabled calendars from the drawer filter list
+  (you can't hide/show what's disabled).
+- `EventEditViewModel.writableCalendars` — exclude disabled, so you can't create
+  into a calendar you've removed from the app. Handle the last-used-calendar
+  preselect falling on a now-disabled calendar (fall back to first enabled
+  writable).
+- `ImportViewModel` — exclude disabled from the import target list.
+- `CalendarsScreen` / `CalendarsViewModel` — the **only** surface that lists
+  disabled calendars; add `setDisabled(id, Boolean)` and a per-calendar toggle.
+
+**UI — Settings → Calendars (no new tab).** Add an enable/disable control to each
+row on the existing `CalendarsScreen` (both the local and the synced/read-only
+groups — disabling is an app-side view choice, independent of write access).
+Disabled rows render visibly de-emphasised (dimmed) but keep the toggle so
+they're re-enableable. Follow the project dialog/list conventions (M3 grouped
+list, `option-card-modal-style-default` if a confirm/selection surface is needed).
+
+**Decided behaviour:**
+- All calendars disabled → views show the existing empty state.
+- A disabled calendar that still holds events: events simply vanish from
+  views/search until re-enabled (no data touched — it's a filter, not a delete).
+- Deep links / notifications pointing at an event in a disabled calendar still
+  open its detail screen — detail is a direct id lookup, not an `instances()`
+  query, so disabling never strands an existing link.
+
+## Reminders — defaults & delivery reliability *(shipped v2.6.0; built on `feat/default-reminders`)*
+
+Two themes bundled because both are "make reminders trustworthy" — the core of
+the "Calendula is your only calendar app" promise.
+
+**Built in this slice (A + the safe half of B):** global timed default reminder
++ a **separate all-day default** (day-scale lead times) + per-calendar override
+(timed events), applied on create with manual-edit / calendar-switch / all-day-
+toggle handling; three pickers + per-calendar override list in Settings →
+Notifications; battery-optimisation exemption row (status + system deep-link, no
+extra permission). `resolveDefaultReminder` + prefs round-trips unit-tested.
+Resolution model: all-day events use the all-day global default outright;
+per-calendar overrides govern timed events only. Reviewed (8-angle), fixes
+applied: form-reset state race, label-fn consolidation with the detail screen,
+inline wrapper + single combined flow read.
+
+**Deliberately deferred (documented decisions, not oversights):**
+- *Absolute time-of-day for all-day reminders* — the all-day default is still
+  minutes-before-midnight (day-scale presets), not "9am the day before" (open
+  decision #2's richer half). Per-calendar all-day overrides also deferred.
+- *Self-scheduled alarms* — kept the existing provider-broadcast architecture
+  (open decision #1). The battery exemption is the reliability lever; no
+  `AlarmManager`/`USE_EXACT_ALARM` subsystem was added.
+- *Test-reminder diagnostic* and *battery prompt inside onboarding* — the
+  exemption lives only in Settings for now (onboarding flow untouched to keep
+  the change reviewable).
+
+### A. Default reminders (global + per-calendar override)
+
+**No provider backing.** `CalendarContract` has no column that auto-applies a
+default reminder per calendar — Google's per-calendar defaults live server-side.
+So both the global default *and* the per-calendar override are **app-side
+preferences**, applied by us at event-insert time. We inherit nothing from the
+synced calendar.
+
+- **Storage (DataStore):**
+  - `defaultReminderMinutes: Int?` — global default; `null` = "no reminder".
+  - `defaultAllDayReminderMinutes: Int?` — separate all-day default (all-day
+    reminders are expressed as minutes before midnight / day-before-at-time, not
+    minutes before a start instant — they need their own value).
+  - `perCalendarReminderOverride: Map<Long, Int?>` — keyed by calendar id;
+    **absent key = inherit global**, explicit `null` = "no reminder for this
+    calendar". (Same for an all-day override map if we want per-calendar all-day.)
+- **Apply on create:** a fresh event prefills its reminders list from
+  override-or-global for the preselected calendar. Changing the calendar in the
+  form re-applies the *new* calendar's default **only if the user hasn't manually
+  edited the reminders** — track a dirty flag, mirroring the per-event-color
+  reset pattern (v2.4).
+- **Edit semantics:** defaults apply to **new events only**; never rewrite
+  reminders on existing events on open or on calendar-switch-during-edit.
+- **Settings UI (Notifications sub-page):**
+  - Global default via OptionCard (None / at time of event / 5 / 10 / 15 / 30 min
+    / 1 h / 1 day / custom), plus the separate all-day default.
+  - Per-calendar overrides: a row per writable calendar (in the Calendars screen
+    or a Notifications subsection), each opening the same OptionCard with a
+    leading **"Use global default"** option.
+
+### B. Delivery reliability (exact alarms + battery)
+
+The provider broadcasts `EVENT_REMINDER`, but on modern Android (Doze / OEM
+battery managers) delivery can be silently delayed or dropped. v1.4 deferred this;
+it directly undermines the feature's premise, so it rides in here.
+
+- **Exact alarm — decision first:** trust the provider broadcast, or
+  self-schedule via `AlarmManager.setExactAndAllowWhileIdle` for reliability?
+  If we self-schedule, declare `USE_EXACT_ALARM` (API 33+, auto-granted for
+  calendar/alarm-category apps, F-Droid-clean) with a `SCHEDULE_EXACT_ALARM`
+  fallback for API 31–32 (user-revocable → settings deep-link prompt).
+- **Battery-optimization exemption:** a *soft, optional* prompt via
+  `ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS` (settings deep-link — never the
+  auto-grant intent), honest copy: "Android may delay reminders to save battery;
+  exempt Calendula for on-time delivery." Shown once after the existing
+  `POST_NOTIFICATIONS` onboarding step, reversible in Settings → Notifications.
+- **Diagnostics:** a "send a test reminder in 1 minute" button in Notifications
+  settings so users can verify delivery on their specific OEM (Samsung / Xiaomi
+  are notorious for suppressing it).
+
+### Decisions made (as shipped in v2.6.0)
+
+1. **Provider broadcast kept** — did not self-schedule via `AlarmManager`; the
+   battery-optimisation exemption is the reliability lever (simplicity + battery
+   cost won over the exact-alarm subsystem).
+2. **All-day reminders = minutes-before-midnight** (day-scale presets); absolute
+   time-of-day ("9am the day before") deferred — see the deferred list above.
+3. **Per-calendar overrides live in the Notifications sub-page** (override list),
+   governing timed events only.
+
+### Round two
+
+- ~~Snooze + dismiss actions on the notification~~ *(shipped in release/v2.8.0,
+  Tier 4 #11)* — snooze re-fires a snooze-only exact alarm.
+
+## Sharing & interop
+
+- ~~Share event as .ics + open/receive .ics into a prefilled create form~~
+  **shipped v2.7.0** — single-event share from detail; opening an `.ics` with one
+  event prefills the create form, many events opens a bulk import (dedup by UID)
+- ~~ICS file import~~ **shipped v2.7.0** — covered by the open/receive `.ics`
+  flow above (single → form, many → bulk import)
+
+## Platform & launchers
+
+- ~~Home-screen widget~~ **shipped v2.5.0** — agenda + month widgets
+- ~~App shortcuts (launcher long-press → New event)~~ **shipped v2.5.0**
+- ~~"New event" Quick Settings tile~~ **shipped v2.8.0**
+
+## Quality & reliability
+
+- **Accessibility pass** — TalkBack content descriptions across all screens,
+  dynamic-type / large-font reflow, touch-target audit. Quality bar for an
+  F-Droid app; nothing tracks it yet.
+- **Reminder delivery reliability** — exact alarms + battery-optimization
+  exemption; specced in the "Reminders — defaults & delivery reliability" slice
+  above (Tier 4 #9).
+
+## Locations & People *(go/no-go, captured 2026-06-11)*
+
+Beyond classic calendar-client scope; discussed, deliberately not planned
+in detail yet:
+
+- ~~**Contact address picker** for the location field via the system picker
+  (`ACTION_PICK`)~~ **shipped v2.8.0** — one-shot, needs no READ_CONTACTS, fits
+  the privacy story. The same no-permission mechanism was then reused for the
+  attendee email picker (v2.8.0).
+- **OSM address autocomplete** in the location field (type "Brandenburger
+  Tor" → tap suggestion → resolved address inserted). Backend would be
+  Photon (Nominatim's public policy forbids autocomplete). **Requires the
+  INTERNET permission** — first dent in the "no network access" promise;
+  if built: opt-in (off by default), honest copy, configurable endpoint
+  for self-hosters, onboarding footnote + F-Droid copy reworded. This
+  trade-off is an explicit go/no-go decision before any work starts.
+- **Inline contact suggestions** while typing (needs READ_CONTACTS) — only
+  if the picker proves clunky.
+- **Attendee editing** *(promoted out of this gated bucket 2026-06-22 — now
+  Tier 5 #12, high-importance; the no-permission typed-email path is not an
+  INTERNET/contacts call)*. See the "Attendee editing" sketch below.
+
+### Attendee editing *(Tier 5 #12, opened 2026-06-22)*
+
+The last read-only gap in the event model: attendees are read & shown on the
+detail screen (since v0.6) but the form can't write them. Make guests editable.
+
+- **Read side already done:** `Attendee` domain model + status/relationship/type
+  enums, `queryAttendees` + `EventDetailMapper.toAttendee` (with tests), and the
+  attendees `DetailCard` + `AttendeeRow` in `EventDetailScreen`. Nothing to add
+  there.
+- **Write side — SHIPPED (`feat/attendee-editing`, commit b0f34ff, 2026-06-22):**
+  `attendees` on `EventForm`; a Guests section in `EventEditScreen` rendered as an
+  inline grouped list — each guest a tonal card (avatar, name/email, tappable
+  Required/Optional role chip, remove), the trailing card an inline email field
+  (type → Done commits). Persisted by `reconcileAttendees` diffing the provider's
+  `CalendarContract.Attendees` rows on insert + dirty-checked update (new guests =
+  `RELATIONSHIP_ATTENDEE` / `STATUS_INVITED`; kept rows keep their status, only the
+  required/optional type updates; organizer/resource/no-email rows untouched).
+  Reminders restyled to the same grouped-list pattern in passing. Needs only the
+  existing `WRITE_CALENDAR` — no new permission.
+- **Name on manual add — SHIPPED via a contact picker** (2026-06-22). The inline
+  field is email-only (the quick path); the add row also has a **"from contacts"
+  button**: `ACTION_PICK` on `ContactsContract.CommonDataKinds.Email.CONTENT_URI` →
+  the system Contacts app returns a URI to the picked email row, queried for
+  `Email.ADDRESS` **and** the contact `DISPLAY_NAME`, so a picked guest gets both
+  email and name in one tap. The result Intent grants temporary read access, so
+  **no `READ_CONTACTS` permission** — one-shot and user-driven, same no-permission
+  mechanism as the location address picker above. Self/organizer rows stay
+  non-editable.
+- **Invitation behavior — DECIDED 2026-06-22: record-only, all writable
+  calendars.** Calendula has no INTERNET and never sends an invitation itself; it
+  only writes `Attendees` rows. Whether a guest is notified is decided downstream:
+  local calendars notify no one (no sync); CalDAV/DAVx5 PUTs the `ATTENDEE` lines
+  and the *server* decides iMIP delivery; Google's sync adapter pushes the change
+  and Google decides (third-party attendee writes are historically unreliable
+  there). Editing is allowed on **any writable calendar** — not gated to local.
+  - **Honest, backend-aware copy is mandatory** (this is the whole point of the
+    decision): on a synced calendar show "Calendula doesn't send invitations —
+    your calendar account may email guests when it syncs"; on a local calendar
+    show "Stored on this device. No one is notified."
+  - Calendula must **not fabricate an ORGANIZER** or otherwise fake scheduling
+    state to coax a send — it writes the guest list faithfully and leaves
+    scheduling entirely to the backend.
+  - The optional "send an .ics invite via your email app" delegate (`ACTION_SEND`,
+    still no INTERNET) was considered and **deferred** — revisit only if users ask
+    to notify guests explicitly.
+- **Out of scope (for now):** RSVP/your-own-response editing, free/busy lookups,
+  resource booking — all carry server round-trips or richer sync semantics.
+
+## Consciously rejected
+
+- Travel time / weather / smart suggestions (network, core-promise conflict)
+- Natural-language quick entry (high effort, locale-fragile; the prefilled
+  form already covers fast entry)
+- Quick-add sheet (the prefilled full form already covers it — cut in v2.0)
+- Drag & drop rescheduling in day/week — **rejected** (owner decision,
+  reaffirmed 2026-06-22): not wanted. Rescheduling stays via the edit form.

.planning/STATE.md

@@ -0,0 +1,177 @@
+# Calendula — Current State
+
+*Last updated: 2026-06-22*
+
+## Status
+
+**Milestone:** 2 (write support) **complete** — v2.0.0 shipped 2026-06-11.
+**Phase:** post-2.x theme-based backlog work (organised in `ROADMAP.md`).
+**Latest released tag: v2.7.5.** The whole Tier 4 (reliability/data-safety/
+interop) arc is now done or in flight:
+- v2.4.0 per-event colors (2026-06-17)
+- v2.5.0 jump-to-date, Agenda view, agenda + month home-screen widgets, "New
+  event" launcher shortcut (2026-06-17)
+- v2.6.0 default reminders (global + per-calendar override, all-day default,
+  battery-exemption row) + system per-app language (2026-06-18)
+- v2.7.0 **`.ics` engine** — single-event share, local-calendar backup export,
+  open/receive `.ics` (single → form, many → bulk import, dedup by UID)
+  (2026-06-18)
+- v2.7.1–v2.7.5 — crash-reporting + F-Droid reproducible-build hardening + fixes
+
+**Next release `release/v2.8.0` (integration branch, not yet cut to main):**
+holds crash reports via the public Codeberg tracker (MR !27) + reminder
+snooze/dismiss notification actions (MR !28). Version bump to 2.8.0 happens at
+release-cut.
+
+## Progress
+
+- [x] Design spec written and committed (`docs/superpowers/specs/2026-06-08-calendar-app-design.md`)
+- [x] V1 design decisions resolved (App name "Calendula", icon, seed color)
+- [x] Plan 01 written and executed — foundation lands (theme, icon, i18n, Hilt, DataStore, CI green)
+- [x] Plan 02 written and executed — data layer + permission flow + debug screen
+- [x] Month view (S1) — 6-week grid, event dots, today marker, swipe nav, three states (replaces debug screen)
+- [x] Week view (S2) — time schedule with overlap-resolved lanes, all-day strip, swipe nav, three states
+- [x] Day view (S3) — single-column slice reusing the week layout
+- [x] View-switcher (M1) wired — cycles Month ↔ Week ↔ Day
+- [x] Event-detail screen (S4) — full-screen, humanized recurrence
+- [x] Filter sheet (M3) — per-calendar visibility, grouped by account, persisted, applied centrally in the repository
+- [x] Settings (M4) — appearance (theme, dynamic colour, week start), language (per-app locales), about
+- [~] Jump-to-date (M2) — **cut from scope**; "Today" half shipped in v0.5, date-picker dropped
+- [x] Full event read (v0.6) — reminders, status, availability, access level,
+  attendee role + self-response, foreign timezone, and linkified description
+  URLs in the detail view; new domain enums + mapper unit tests. (A dedicated
+  URL field was cut — no `CalendarContract` column backs it.)
+
+- [x] v1.1 write foundation — `WRITE_CALENDAR` (onboarding asks READ+WRITE,
+  only READ gates; contextual upgrade for v1.0 installs), read-only-calendar
+  detection (`CALENDAR_ACCESS_LEVEL` → `canModifyContents`, actions hidden for
+  WebCal/birthday calendars), delete from the detail screen (recurring:
+  "only this event" via cancelled exception / "all events in the series"),
+  repository + mapper tests
+
+- [x] v1.2 create event — full-screen `EventEditScreen` (title, all-day,
+  M3 date/time pickers with duration-preserving start moves, writable-only
+  calendar picker preselecting the last-used calendar, location, description),
+  "+" FAB on all three views prefilled with the visible day, `insertEvent`
+  with provider-correct all-day normalisation (UTC midnights, exclusive end),
+  domain/mapper/repository tests
+
+- [x] v1.3 edit event (shipped 2026-06-11) — `EventEditScreen` reused for
+  edit (detail-screen Edit action, `canModify`-gated, contextual WRITE
+  upgrade), dirty-checked partial `update` on the Events row (recurring:
+  series DTSTART moves by the user's delta, DURATION instead of DTEND),
+  reminder diff by minutes (kept rows keep their method), simple recurrence
+  picker (FREQ/INTERVAL/UNTIL/COUNT; complex RRULEs preserved verbatim and
+  shown humanized), `EventFormField.Recurrence` incl. settings default,
+  recurrence also available on create; domain/mapper/repository tests.
+  Review round 1: weekly BYDAY day-toggles in the custom picker ("every week
+  on Mon+Fri"). Review rounds 2–4: occurrence edit pulled forward from v2.0
+  and made three-way like delete ("this" = exception row via
+  `CONTENT_EXCEPTION_URI`, "this and following" = series split, "all" =
+  series update); delete equally three-way (truncation via RRULE UNTIL);
+  the edit-scope question moved to save time (Google model) — dirty
+  recurring saves park in `SaveUiState.AwaitingScope`, a changed rule drops
+  the "only this event" option
+
+- [x] v1.4 reminder notifications (shipped 2026-06-11) — exported
+  `EVENT_REMINDER` receiver → `CalendarAlerts` (SCHEDULED & due) →
+  dedicated channel, tap opens detail (singleTop deep link); best-effort
+  FIRED marking; one-time onboarding step requesting `POST_NOTIFICATIONS`
+  with duplicate-reminders warning; Settings mirror. Provider only fires
+  `METHOD_ALERT` rows (AOSP-verified), so email reminders never reach us
+
+- [x] v2.0 conflict dialog + store polish (shipped 2026-06-11 as v2.0.0) —
+  `EditSnapshot` compare on save (overwrite/discard; deleted → close),
+  quick-add cut, calendar-switch → v3 backlog; F-Droid/README copy
+  refreshed, fastlane screenshots DE+EN captured on-device
+
+- [x] v2.1 (shipped 2026-06-15) — month grid shows real events as
+  continuous multi-day bars; navigation-drawer View section
+  (Month/Week/Day); cursor-jump fix in event text fields
+
+- [x] v2.2 (shipped 2026-06-16) — tap an empty slot in day/week to create
+  (prefilled with that day + tapped hour, snapped to the hour); local
+  calendar management in a full-screen editor from Settings →
+  Calendars: create/rename/recolor/delete device-only calendars
+  (`ACCOUNT_TYPE_LOCAL`, sync-adapter insert) with name, pastel-previewed
+  colour, and description (stored in `CAL_SYNC1`); synced calendars listed
+  read-only grouped by account with a per-account "manage in source app"
+  deep-link (resolved from the account's authenticator: DAVx5/ICSx5/…) and
+  an add-account shortcut. Shared `InlineTextField` extracted to `ui.common`
+
+- [x] v2.3 settings/calendars/drawer redesign (shipped 2026-06-16) — adopted a
+  shared Material 3 grouped-list blueprint, modelled on the ReFra gallery app
+  and extracted to `ui/common/GroupedList.kt` (`CollapsingScaffold` with a
+  `LargeTopAppBar` exit-until-collapsed title; `GroupedRow` with Position-based
+  corner grouping, press-animated corners, `selected` + `minHeight` knobs).
+    - Settings: category hub (About card on top → version mark at the foot) with
+      sliding sub-pages (Appearance / New event form / Notifications); token-
+      based icon chips; theme/week-start/language pickers migrated from
+      `DropdownMenu` to OptionCard dialogs. New `ic_gitea.xml` (Simple Icons,
+      verbatim path) for the About "Source" button; en+de strings.
+    - Calendar manager: same collapsing scaffold + grouped rows; shared
+      `CalendarColorChip` (neutral chip, pastelised calendar glyph).
+    - Navigation drawer: branded header, grouped View switcher (active view
+      highlighted via `secondaryContainer`), the filter list restyled to
+      grouped rows with a trailing checkbox; the whole drawer scrolls as one.
+    - Cards use `surfaceContainerHigh` for readable contrast against `surface`.
+    - Donate button on the About card deferred (target still TBD).
+
+- [x] v2.4 per-event color (shipped 2026-06-17) — an optional "Color" field in
+  the event form. Read/render already resolved `EVENT_COLOR` with a calendar
+  fallback; this adds the write side and the picker. Palette-backed calendars
+  (Google, some CalDAV) pick from the account's `Colors` (`TYPE_EVENT`) and
+  write `EVENT_COLOR_KEY` so the color round-trips through sync; local
+  calendars write a raw `EVENT_COLOR` from the shared `CALENDAR_COLOR_PALETTE`
+  (extracted with the swatch row to `ui/common/ColorSwatchRow.kt`). Switching
+  calendars resets the choice (a key is account-scoped). A settings toggle
+  ("Allow colors on unsupported calendars", off by default) extends the raw
+  path to synced calendars with no palette, with an honest "may not survive
+  sync" warning on the picker and in Settings. Color writes flow through
+  insert / dirty-checked update / occurrence-exception; mapper + form tests.
+
+- [x] v2.5 (shipped 2026-06-17) — Agenda view (4th top-level view),
+  jump-to-date drawer date picker, two home-screen widgets (scrolling
+  "Upcoming" agenda + month grid), and a "New event" launcher long-press
+  shortcut
+
+- [x] v2.6 (shipped 2026-06-18) — default reminders: global timed default +
+  separate all-day default + per-calendar override (timed), applied on create
+  with dirty-flag handling; three pickers + override list in Settings →
+  Notifications; battery-optimisation exemption row (status + system deep-link,
+  no new permission). Plus system per-app language (Android 13+) and an
+  immediate-effect fix for the in-app language picker
+
+- [x] v2.7 (shipped 2026-06-18) — the `.ics` engine: share a single event as
+  `.ics` from the detail screen; back up local calendars (Settings → Calendars
+  → Export) to a SAF file; open/receive an `.ics` — one event prefills the
+  create form, many events open a bulk import into a chosen calendar (dedup by
+  UID, skip-and-report unrepresentable VTIMEZONE / RECURRENCE-ID / guests).
+  Hand-rolled serializer/parser, zero deps. Plus all-day single-day UTC fix and
+  a widget R8 keep-rule crash fix
+
+- [x] v2.7.1–v2.7.5 (2026-06-21) — launch crash fix (listener before grant),
+  user-controlled crash reporting, widget loading-spinner R8 keep rule, and
+  F-Droid reproducible-build cleanups for the official repo
+
+- [~] release/v2.8.0 (not yet cut) — crash reports via the public Codeberg
+  tracker (MR !27) + reminder snooze/dismiss notification actions (MR !28,
+  snooze self-schedules an exact alarm; primary delivery stays provider-broadcast)
+
+## Next
+
+1. Cut **v2.8.0** from `release/v2.8.0` (bump versionName → tag via the
+   merge-driven pipeline) once on-device review signs off
+2. **Attendee editing** — the committed next feature (Tier 5 #12, high-
+   importance, opened 2026-06-22). Attendees are already read & shown on the
+   detail screen since v0.6; the gap is the write side — make guests editable
+   in `EventEditScreen` / `EventForm` (add by typed email, role, remove),
+   persisted by diffing `CalendarContract.Attendees`. No new permission for the
+   typed-email path. **Invitation behavior DECIDED 2026-06-22: record-only on all
+   writable calendars** — Calendula never sends (no INTERNET); honest backend-aware
+   copy ("your account may email guests when it syncs" on synced calendars, "no one
+   is notified" on local). Full sketch in `ROADMAP.md` → "Attendee editing".
+3. Then: the two INTERNET go/no-go calls (OSM autocomplete, remote calendar
+   create/edit) and Tier 2/3 leftovers (quick-settings tile, now-line, week
+   numbers in month, full-text search, accessibility pass). Drag-and-drop
+   rescheduling is **rejected**.

CHANGELOG.md

@@ -5,306 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-
-## [2.18.0] — 2026-07-31
-
-### Added
-- A new event no longer always lasts an hour. **Settings → New event form →
-  Default duration** sets how long one opens, and each calendar may keep its own
-  length underneath — 8 hours for the calendar you keep work shifts in, 30
-  minutes for the one you book calls in. A calendar without its own length
-  follows the default, switching calendars mid-form re-stretches the event, and
-  setting an end time by hand keeps it. An event another app hands over with only
-  a start gets the default too; one that names its own end — an `.ics` file, a
-  duplicate — keeps that length. All-day events are unaffected ([#54]).
-- Week and day view can be set to show more or less of the day at once, under
-  Settings → Views → Week & day → **Hour height**. **Fit whole day** sizes an
-  hour to your screen so all 24 hours are visible without scrolling — on a tall
-  phone the old fixed spacing showed only about half a day, so appointments
-  could sit below the fold all week. Compact and Comfortable are fixed steps
-  either side of the previous spacing, which stays the default. Both views share
-  the setting ([#56]).
-- Week and day view can be **pinched** with two fingers to set the hour height
-  directly, anywhere between and beyond the named steps. The time under your
-  fingers stays put as it zooms, so you keep your place in the day. A pinched
-  height is remembered and appears as **Custom** in the Hour height setting, so
-  tapping a named step there takes you back to it ([#56]).
-
-### Changed
-- The date in the top bar is now the way to jump: tapping the month, week or day
-  title opens the same date picker the sidebar's **Jump to date** offers, seeded
-  on whatever the bar is naming. A drop-down caret marks it as tappable. The
-  sidebar entry stays where it is ([#57]).
-- A reminder in the status bar is now Calendula's own mark — the calendar with
-  the bloom — instead of the generic calendar glyph it shared with the system's
-  date surfaces and every other calendar app. The status bar draws that icon as
-  a plain silhouette, so its shape is the only thing that could tell them apart
-  ([#83]).
-- Event blocks now only draw text they can draw whole. One too short for a full
-  line shows no title rather than a sliced one, a block that cannot fit both its
-  title and its time keeps the title, and a block too narrow to hold more than a
-  syllable stays on one ellipsised line instead of stacking letters down the
-  block. Tapping and the spoken description are unchanged ([#56]).
-- Calendar colours are reworked so text on an event is always readable. They
-  were shaped by a brightness setting that does not match what the eye sees, so
-  whether a block got dark or light text depended on which hue you happened to
-  pick — an orange calendar took dark text while a red one beside it took light
-  — and colours landing in between were hard to read either way. Each colour now
-  keeps its hue and is moved clear of that middle: most become deep blocks with
-  light text, while naturally pale colours such as yellow stay pale and take
-  dark text, rather than being forced into a muddy brown. Dots, stripes and
-  icons are tuned separately from blocks, so they stay visible against the
-  background instead of sharing a colour meant to sit behind text. The setting
-  is now called **Harmonise calendar colours**; turning it off still shows the
-  raw colours from your calendar source ([#21], [#36]).
-
-### Fixed
-- The back gesture closes the sidebar instead of the app. With the drawer open,
-  swiping back left Calendula altogether rather than putting the sidebar away
-  ([#114]).
-- The sidebar lines up. "Calendula", "View" and "Calendars" now share the left
-  edge of the rows under them, and the view, jump-to-date, Settings and calendar
-  rows sit on one vertical axis instead of each icon finding its own — the same
-  alignment the Settings screens use ([#114]).
-- The status- and navigation-bar icons follow Calendula's own light/dark choice.
-  Setting the app dark while the system stayed light — or the other way round —
-  left the clock and battery drawn for the system's theme, so they could sit
-  near-invisible against the app's own bar ([#70]).
-
-## [2.17.1] — 2026-07-30
-
-### Added
-- Settings → Calendars now says what is different about a calendar instead of
-  leaving you to guess. Ones you can only view — a subscribed calendar, a
-  calendar shared with you read-only — are marked **Read-only** ([#76]).
-- Calendars your device isn't syncing are marked **Not synced**, moved to the
-  bottom of their account and left without a switch. None of their events are on
-  the device, so the switch they used to have could not have shown you anything
-  — the calendar simply looked broken. They are no longer offered when you pick
-  a calendar for a new or an imported event either: an event saved there would
-  never reach the account. Whether an account syncs a calendar stays that
-  account's own app's decision ([#78]).
-- The birthday and anniversary calendars Calendula fills from your contacts are
-  marked **Filled from your contacts**, which is why they can't be picked for a
-  new event: anything you put there would be removed again on the next sync.
-  Deleting one is held back while special dates are switched on — Calendula
-  would simply create it again — and the calendar's editor says so; turn the
-  feature off under Settings → Special dates and the delete works as usual
-  ([#76]).
-- The calendar picker in the event form and in the .ics import screen now ends
-  with a **"Missing a calendar?"** row that opens Settings → Calendars, where
-  those marks then explain why a calendar isn't offered ([#76]).
-- The agenda widget's text size is yours to set. **Settings → Widgets & tiles →
-  Agenda widget size** offers Small, Medium, Large and Extra large, replacing the guess
-  the widget used to make from its own measurements. Small is what it looks like
-  today, so nothing changes until you turn it up ([#51]).
-- A repeating event now shows you its next few dates, not just a description of
-  the rule. Both the preset list and the custom recurrence picker carry a
-  **Next:** line — "Next: 30 Jul, 6 Aug, 13 Aug" — under the rule they would
-  save. A phrase like "monthly" on the 31st, or "every 2 weeks on Mon & Fri",
-  can mean something other than it sounds like, and only the dates say so. A
-  rule that can never fire says that instead ([#69]).
-- The event visibility options now say who they affect. **Public**, **Private**
-  and **Confidential** each carry a line about what other people on a shared
-  calendar see — the part the four words on their own leave out ([#69]).
-
-### Changed
-- **Settings has been reorganised so each setting sits where you would look for
-  it.** One long undifferentiated list is now three labelled groups — Look &
-  behaviour, Data, and App — whose rows open sub-screens and say what they do
-  rather than only naming themselves. Appearance, Views, New event form,
-  Notifications and the new Widgets & tiles are separate screens now, so the
-  settings for a calendar view are no longer mixed in with the ones for the
-  app's colours or for the home-screen widgets ([#69]).
-- Settings that are hard to picture from their name now show you what they do.
-  The week-start picker rearranges a real month grid as you choose, the
-  past-events setting previews a sample agenda day for Show, Dim and Hide, the
-  font pickers set a specimen line in the face you are choosing, and the Agenda
-  range options carry the dates each one actually covers. Options that follow
-  the system additionally name which way they currently fall ([#69]).
-- **Backup & restore** is now its own Settings entry instead of living inside
-  the calendar manager, where it was easy to miss — keeping a copy of your
-  calendars is a different question from which calendars you have. The calendar
-  manager keeps a row pointing to it, and nothing about how backup or automatic
-  backup works has changed ([#69]).
-- Calendula's source code now lives on **Codeberg**, where its issues already
-  were. The **Source code** and **License** links in Settings → About point
-  there, so reporting a bug and reading the code no longer land on two different
-  sites. Nothing about the app itself changes, and the F-Droid repository is
-  unaffected.
-
-### Fixed
-- A month-grid widget stays a month grid, and draws all seven days again. Since
-  2.16.0 a placed month widget could redraw itself as the agenda widget a little
-  after any change to your events, and could draw only about four day columns
-  with the last one cut off part-way through. Both came from the release build
-  merging the two widgets into a single class, so Android could no longer tell
-  which of them a widget on your home screen was — and the month grid was handed
-  the wrong widget's measurements to lay its columns out against ([#89], [#103]).
-- The back gesture on **Settings → Views** returns to Settings instead of
-  leaving Settings altogether and dropping you on the calendar. Special dates
-  did the same ([#81]).
-- The dots standing in for the events that didn't fit a day in the month view
-  now dim with everything else when **Dim completed events** is on. A past day
-  with four or more events kept its last events at full strength while the rest
-  faded ([#79]).
-- Two accounts that happen to share a name — a Google account and a DAVx5
-  account for the same address, say — are no longer merged into one group.
-  They were listed together in Settings → Calendars and in the drawer's filter,
-  which also meant the group's source icon and its "manage in app" button could
-  send you to the wrong app, "toggle all" spanned both accounts at once, and
-  collapsing one collapsed the other. Where a name really is shared, each group
-  now names the app it comes from ([#77]).
-- In the month view's **Split** style, the new-event button now starts on the
-  day you have selected. It always started on today, whichever day was selected
-  and listed below the grid ([#87]).
-- Search results now show an all-day event's real date. West of UTC — anywhere in
-  the Americas, say — a search hit was dated one day early, disagreeing with the
-  day the month, week and agenda views file the same event under ([#82]).
-- Reminders no longer depend on Android telling Calendula when they are due.
-  Calendula now works out each reminder's time itself and sets its own alarm for
-  it. On some phones — Samsung's among them — the system's calendar storage never
-  sends the signal a calendar app is meant to wake up on, and no amount of
-  battery or notification settings helps: the reminder is simply never announced.
-  None of that is visible from inside an app that waits to be told, which is why
-  it took a second pass to find ([#75]).
-
-  Reminders also survive things that used to lose them quietly. After a restart
-  or an app update Calendula re-arms its alarms, and a reminder whose moment
-  passed while the phone was off still arrives, as long as the event has not
-  ended yet.
-
-- All-day reminders now arrive at the time you chose in **Settings →
-  Notifications**, on every occurrence. A yearly birthday could drift an hour
-  either way depending on daylight saving, and all-day reminders on calendars
-  from an account fired in the middle of the night instead of in the morning
-  ([#75]).
-
-- Reminders now arrive for every calendar you have switched on. A calendar that
-  was hidden at system level — switched off in another calendar app, or never
-  switched on after being added — still showed its events and listed their
-  reminders in Calendula, but never notified: Android only schedules reminder
-  alarms for calendars marked visible, and Calendula kept its own separate
-  on/off list that had no say in it. There is now one switch: **Settings →
-  Calendars** turns a calendar on or off for the whole device, so what you see
-  and what reminds you can no longer disagree ([#75]).
-
-  Calendars you had switched off in Calendula are switched off here too on first
-  launch. Calendars that were already off — hidden in another calendar app, or
-  never switched on after being added — stay off, and Calendula says so once
-  rather than quietly switching them on for every app on your device; you can
-  turn any of them back on in Settings → Calendars.
-
-  If you gave Calendula read-only access to your calendars, the switch still
-  works: your choice is kept in the app until it can be written.
-
-  The drawer's filter is unchanged and still app-only: hiding a calendar there
-  tidies your view without silencing its reminders.
-
-## [2.16.0] — 2026-07-24
-
-### Added
-- Choose how the month view is laid out. A new **Month view style** setting
-  (Settings → Views) offers three ways to read a month, each shown with a
-  preview of the layout it produces:
-  - **Pages** — what you have today: one month at a time, swiped sideways.
-  - **Continuous** — scroll up and down through the weeks without a break
-    between months. Because the weeks run on unbroken, no month is cut off and
-    no day appears twice, where paging repeats a boundary week at the end of one
-    month and the start of the next. The 1st of each month names itself so you
-    always know where you are, and the title bar keeps up as you scroll ([#38]).
-  - **Split** — a compact grid showing coloured dots for the days that have
-    something on them, with the day you tap listed in full underneath. Tap the
-    date above the list to open the whole day ([#53]).
-
-  The Agenda view is untouched by this and stays available in all three styles —
-  the split layout lists a single day, while Agenda remains a rolling multi-day
-  window with its own range settings.
-- Give an event its own time zone. A new **Time zone** field (under "more
-  fields" in the event form) pins an event to a specific zone, so a call set for
-  8:00 AM in New York stays 8:00 AM in New York wherever you open it — and keeps
-  tracking that zone across daylight-saving changes instead of drifting an hour.
-  The form edits the event in its own zone and shows the local equivalent under
-  the times ("2:00 PM – 3:00 PM your time"); the event's details keep your local
-  time first and note the original beneath it, so both are always clear. Pick a
-  zone from a full-screen picker with your device zone and recent choices on top,
-  searching by city ("new york"), IANA id ("europe/berlin"), or abbreviation
-  ("CEST") to gather every matching zone at once. All-day events stay
-  date-anchored and carry no zone, as before ([#31]).
-- Put the "jump to today" button in the toolbar. A new **Today button in
-  toolbar** setting (Settings → Appearance, off by default) swaps the floating
-  button that fades into the corner while you're away from today for a permanent
-  today icon in the top bar — always there, on today or not, matching the
-  familiar calendar-app pattern. Leave it off to keep the floating button as
-  before ([#60]).
-- Choose what Calendula calls itself on your home screen. A new **App name**
-  setting (Settings → Appearance) switches the launcher label between
-  **Calendula** and **Calendar**, for launchers that can't rename apps
-  themselves. Pick from a full-screen chooser that previews both names as
-  launcher marks; the change applies at once ([#44]).
-- Calendula now speaks **Arabic**, laid out right-to-left, and its French and
-  Italian translations have been brought up to date — thanks to the community
-  translators on Weblate. Pick a language under Settings → Language (or leave it
-  on the system default).
-
-### Changed
-- Dates in the Month, Week and Day title bars now follow your language and
-  region instead of one hardcoded layout. Every date was rendered in a fixed
-  German-style order with a trailing dot on the day number, whatever your
-  settings: US English showed "Fri, 17. Jul 2026" where it should read
-  "Fri, Jul 17". The Agenda view already formatted correctly, so the two
-  disagreed about the same date. All four views now share one formatter, and the
-  day/month order, the separators and the ordinal all come from your locale —
-  so English-in-Germany reads "Fri, 17 Jul" and English-in-the-US "Fri, Jul 17",
-  each correct for where you are ([#60]).
-- The title bar drops the year while you're in the current one — "July" rather
-  than "July 2026". The year reappears the moment you page out of the current
-  year, which is when it tells you something you didn't already know.
-- The Week view's title now names the month instead of spelling out the day range.
-  "24. Jun – 31. Jun" restated the day numbers already printed in the column
-  headers right below it, in the widest string in the bar. A week that straddles
-  two months keeps the outgoing month until it is fully gone ([#60]).
-- The custom recurrence picker has been redesigned and tightened up. As you
-  build a rule — "every 2 weeks on Mon & Wed, until a date" — the live summary
-  now describes exactly what will be saved rather than a near-copy that could
-  drift from it, the amount fields accept being left blank (reading as their
-  shown default instead of greying out OK), and the read-out no longer jumps
-  around as you tap weekdays ([#42]).
-
-### Fixed
-- An all-day event no longer shows up again the day after it happened. In time
-  zones east of UTC, an all-day event — a birthday, say — set for one day also
-  appeared under the *next* day's heading in the Agenda (and the agenda widget),
-  because all-day events are anchored to UTC midnight and the following day's
-  window reached back across that boundary and pulled the event forward onto
-  "today". Each all-day event now lists only on the day it actually falls on
-  ([#65]).
-- A multi-day event now shows under every day it spans in the Agenda, not just
-  its first day, so a trip or a multi-day booking appears on each day it covers.
-- The "Upcoming" agenda widget now scales its text and rows to the size you give
-  it. Previously it was laid out once for the smallest size and simply stretched
-  when enlarged, so the text stayed small no matter how big you made the widget.
-  Now a bigger widget gets bigger, more readable type and roomier rows, while the
-  default size looks exactly as before — no new setting; it follows the size you
-  already chose ([#51]).
-- Calendula now appears under other apps' "Add to calendar" / "Save to calendar"
-  actions. Some apps (e.g. DB Navigator) fire the widely-used "insert event"
-  intent with the singular `vnd.android.cursor.item/event` type, which Calendula
-  didn't advertise — so it was left out of the chooser, and if it was your only
-  calendar app the save silently did nothing. It now accepts that form, plus the
-  `INSERT_OR_EDIT` action, and opens the new event prefilled for review ([#74]).
-- Opening a `.ics`/`.vcs` file now works even when another app hands it over
-  mislabelled as a generic download (`application/octet-stream`), as some mail
-  clients, browsers and file managers do — Calendula recognises it by its file
-  extension instead of relying on the declared type ([#74]).
-- A recurrence end date no longer lands a day late. West of UTC, setting a rule
-  to end "until" a given day could save and show the day after the one picked;
-  the end date now reads back as chosen ([#42]).
-- The status- and navigation-bar icons stay legible over full-screen pickers in
-  dark theme. They could render dark-on-dark — a near-invisible black clock
-  against the dark picker — instead of switching to light ([#70]).
-
 ## [2.15.0] — 2026-07-15
 
 ### Added
@@ -1284,7 +984,6 @@ automatically, with zero telemetry and no internet permission.
 [#29]: https://codeberg.org/jlmakiola/calendula/issues/29
 [#21]: https://codeberg.org/jlmakiola/calendula/issues/21
 [#30]: https://codeberg.org/jlmakiola/calendula/issues/30
-[#31]: https://codeberg.org/jlmakiola/calendula/issues/31
 [#32]: https://codeberg.org/jlmakiola/calendula/issues/32
 [#33]: https://codeberg.org/jlmakiola/calendula/issues/33
 [#34]: https://codeberg.org/jlmakiola/calendula/issues/34
@@ -1297,29 +996,4 @@ automatically, with zero telemetry and no internet permission.
 [#47]: https://codeberg.org/jlmakiola/calendula/issues/47
 [#48]: https://codeberg.org/jlmakiola/calendula/issues/48
 [#49]: https://codeberg.org/jlmakiola/calendula/issues/49
-[#51]: https://codeberg.org/jlmakiola/calendula/issues/51
 [#52]: https://codeberg.org/jlmakiola/calendula/issues/52
-[#38]: https://codeberg.org/jlmakiola/calendula/issues/38
-[#53]: https://codeberg.org/jlmakiola/calendula/issues/53
-[#60]: https://codeberg.org/jlmakiola/calendula/issues/60
-[#65]: https://codeberg.org/jlmakiola/calendula/issues/65
-[#74]: https://codeberg.org/jlmakiola/calendula/issues/74
-[#42]: https://codeberg.org/jlmakiola/calendula/issues/42
-[#44]: https://codeberg.org/jlmakiola/calendula/issues/44
-[#70]: https://codeberg.org/jlmakiola/calendula/issues/70
-[#75]: https://codeberg.org/jlmakiola/calendula/issues/75
-[#76]: https://codeberg.org/jlmakiola/calendula/issues/76
-[#78]: https://codeberg.org/jlmakiola/calendula/issues/78
-[#77]: https://codeberg.org/jlmakiola/calendula/issues/77
-[#79]: https://codeberg.org/jlmakiola/calendula/issues/79
-[#81]: https://codeberg.org/jlmakiola/calendula/issues/81
-[#82]: https://codeberg.org/jlmakiola/calendula/issues/82
-[#83]: https://codeberg.org/jlmakiola/calendula/issues/83
-[#87]: https://codeberg.org/jlmakiola/calendula/issues/87
-[#89]: https://codeberg.org/jlmakiola/calendula/issues/89
-[#103]: https://codeberg.org/jlmakiola/calendula/issues/103
-[#69]: https://codeberg.org/jlmakiola/calendula/issues/69
-[#54]: https://codeberg.org/jlmakiola/calendula/issues/54
-[#57]: https://codeberg.org/jlmakiola/calendula/issues/57
-[#56]: https://codeberg.org/jlmakiola/calendula/issues/56
-[#114]: https://codeberg.org/jlmakiola/calendula/issues/114

CONTRIBUTING.md

@@ -1,184 +0,0 @@
-# Contributing to Calendula
-
-Calendula is a Material 3 Expressive calendar app that lives strictly on top of
-Android's `CalendarContract` — no app database, no sync stack, no network access.
-That constraint shapes most review comments, so
-[`docs/ARCHITECTURE.md`](docs/ARCHITECTURE.md) is worth skimming before you write
-code. This file is the practical how.
-
-**[Codeberg](https://codeberg.org/jlmakiola/calendula) is the canonical home** —
-issues, pull requests, releases. The self-hosted Gitea instance referenced in the
-release docs is build infrastructure only; there is nothing to contribute there.
-Be decent to the people you meet in the tracker.
-
-## Start with an issue
-
-| You want to | Do this |
-|---|---|
-| Add a feature | **Open an issue first** and wait for a go-ahead |
-| Fix a bug | Open an issue, then a pull request |
-| Fix a typo, a comment, or docs | Just open the pull request |
-| Add or fix a translation | **Don't** — [use Weblate](#translations) |
-
-Features get an opinion before they get code: whether Calendula should do a
-thing at all is the one decision a patch can't make. A feature PR that arrives
-without a discussed issue may be closed unmerged even when the code is good —
-please don't spend a weekend on one first.
-
-Bugs are more straightforward, but still start with an issue: it's what carries
-the milestone and gives the changelog something to link.
-
-Issue templates cover bug, crash, feature and question. For a crash, let the app
-do the work — **Settings → Report a problem**, or the prompt shown after a crash,
-captures the stack trace and prefills the form. The report contains app, Android
-and device versions plus the trace; no calendar content, no personal data.
-
-## Which branch to target
-
-Calendula releases by merging a version bump into `main`, so `main` is a release
-trigger rather than a staging area. Work is assembled on release branches first.
-
-Once your issue has a milestone, that milestone names your branch:
-
-| Milestone | Target branch |
-|---|---|
-| `2.18.0` | `release/v2.18.0` |
-
-Every milestone has a matching branch. If it's somehow missing, target `main` and
-mention it in the PR — it will be retargeted. Don't pick an older release branch:
-they're kept after shipping, so the newest one isn't necessarily yours.
-
-## Translations
-
-**Never edit a `values-*/strings.xml` file in a pull request** — German included.
-Translations are owned by a self-hosted Weblate that writes to this repository
-directly, and a hand-edit is overwritten on the next sync.
-
-→ **[Translate Calendula on Weblate](https://weblate.dev.jeanlucmakiola.de/engage/calendula/)**
-
-Adding a *new* English string to `values/strings.xml` is normal PR work; Weblate
-picks it up and offers it to translators. Partial translations are expected and
-fine — missing keys are informational. Stale and orphaned keys are not, so run
-
-```sh
-python3 scripts/check_translations.py
-```
-
-before pushing. It reports those more clearly than lint's `MissingTranslation`
-does.
-
-## Build & test
-
-```sh
-git clone --recurse-submodules https://codeberg.org/jlmakiola/calendula.git
-```
-
-The `floret-kit` submodule is a composite build compiled from source. An
-existing clone needs `git submodule update --init --recursive`, or nothing
-resolves.
-
-- **JDK 17** — not newer; the Android Gradle Plugin requires exactly 17. Set
-  `JAVA_HOME` if your default differs.
-- **Android SDK** — platform 37 (`compileSdk`) and build-tools 36.0.0, located
-  via `ANDROID_HOME` or a gitignored `local.properties` with `sdk.dir`. If you
-  go the `local.properties` route the included build needs its own copy at
-  `floret-kit/local.properties`; `ANDROID_HOME` covers both at once and is the
-  easier path.
-
-The Gradle wrapper is checked in, so no system Gradle is needed.
-
-```sh
-./gradlew lint test assembleDebug     # roughly what CI runs
-```
-
-A single test class, or a pattern:
-
-```sh
-./gradlew testDebugUnitTest --tests "de.jeanlucmakiola.calendula.domain.SimpleRecurrenceTest"
-./gradlew testDebugUnitTest --tests "*SimpleRecurrence*"
-```
-
-CI reports one `CI` check per pull request: `lintDebug`, `testDebugUnitTest`,
-`assembleDebug`, and a Trivy scan. Pull requests touching only docs, F-Droid
-metadata or the licence skip the Android build and go green quickly. More detail
-in [`docs/BUILDING.md`](docs/BUILDING.md).
-
-## The rules
-
-These are the ones that turn into review comments.
-
-1. **No network.** Calendula holds no `INTERNET` permission, and that's a
-   feature rather than an oversight. Anything that would need one is a product
-   decision before it's a patch — the crash reporter deliberately opens a
-   prefilled web issue instead of posting anything itself.
-2. **The provider is the only database.** No Room, no cache, no local mirror of
-   events. `CalendarContract` is the single source of truth, which is also why
-   externally synced changes work for free.
-3. **Don't patch UI state after a write.** A `ContentObserver` re-queries and
-   views recompose from fresh provider state. Hand-patching a list after saving
-   appears to work, then quietly diverges from what the provider actually stored.
-4. **`domain/` has no Android imports.** Models, validation, recurrence
-   rendering, conflict snapshots and the `.ics` codec stay pure Kotlin so they
-   remain JVM-testable.
-5. **Tests run on the JVM.** JUnit 5 + Truth + Turbine. The seams exist for you:
-   fake the data source (`FakeCalendarDataSource`), and feed mappers plain maps
-   through `ColumnReader` instead of cursors. Instrumented tests are a last
-   resort, not a default.
-6. **Read before touching the subtle pipelines.** Recurring writes (UNTIL vs
-   DURATION, exception URIs, series splits), save-conflict detection and reminder
-   delivery (post-before-mark) follow provider-driven rules that are documented
-   in [`docs/ARCHITECTURE.md`](docs/ARCHITECTURE.md) and are not guessable from
-   the code alone.
-7. **Don't break reproducible builds.** `vcsInfo`, `dependenciesInfo` and the AGP
-   metadata block are disabled on purpose so the official F-Droid repo can verify
-   our binary against a from-source rebuild.
-   `scripts/check_reproducible_release.sh` runs on every pull request, including
-   docs-only ones.
-
-## UI conventions
-
-Material 3 Expressive throughout, built from the system's own tokens and
-components — colour-scheme tokens rather than hardcoded colours, `ListItem` for
-settings rows.
-
-**Selection pickers are full-screen.** Every browse-style "choose one" surface
-uses floret-kit's `FullScreenPicker` / `OptionPicker`; one that needs a commit or
-extra action passes it through the picker's `actions` slot. The exception is the
-recurring-scope chooser (*this / this and following / all*), which stays a
-compact dialog — a two- or three-option decision reads better as a popup than as
-a nearly empty screen. `AlertDialog` is for plain confirmations only, and radio-
-or text-list dialogs aren't used at all.
-
-Shared UI machinery lives in the `floret-kit` submodule and has
-[its own contributing guide](https://codeberg.org/jlmakiola/floret-kit/src/branch/main/CONTRIBUTING.md);
-changing it means a pull request against that repository plus a submodule bump
-here.
-
-## Commits & pull requests
-
-Conventional commits, scoped to the area you touched:
-
-```
-fix(calendars): keep an event's own calendar when it is switched off
-feat(month): pull-to-expand the split view (#38)
-docs(architecture): record what the second review pass changed
-```
-
-Types in use: `feat` `fix` `docs` `refactor` `style` `chore` `ci` `build`
-`revert`. Reference the issue in the subject or the body. Keep commits small —
-small commits revert cleanly, which matters more here than a tidy history.
-
-If your change is user-visible, add an entry under `## [Unreleased]` in
-[`CHANGELOG.md`](CHANGELOG.md). Match the surrounding voice: entries describe
-what changed *for the person using the app*, and why, not what changed in the
-code. Link the issue and add its reference at the bottom of the file. It may get
-reworded when the release is cut, so don't agonise over it.
-
-Please don't commit planning or design documents. Code, tests, architecture notes
-and the changelog land; the reasoning belongs in the commit message and the
-issue.
-
-## Licence
-
-Calendula is [MIT](LICENSE). By contributing you agree your changes ship under
-the same licence.

Gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-# fastlane is used ONLY to upload the release bundle to Google Play
-# (see fastlane/Fastfile). It is not part of the build or the signing path, so
-# it never runs on a PR — only in release.yaml's `play` job.
-#
-# Pinned exactly; Renovate's bundler manager keeps it bumped. No Gemfile.lock is
-# committed on purpose: this resolves an uploader's transitive deps, not the
-# app's, and none of it affects the reproducible release build.
-gem "fastlane", "2.237.0"

README.md

@@ -8,7 +8,7 @@
 Reads, writes, and reminds — on top of the system calendar, with zero network access.</p>
 
 <p>
-<a href="https://codeberg.org/jlmakiola/calendula/actions"><img src="https://codeberg.org/jlmakiola/calendula/actions/workflows/ci.yaml/badge.svg?branch=main" alt="CI"></a>
+<a href="https://gitea.jeanlucmakiola.de/makiolaj/calendula/actions"><img src="https://gitea.jeanlucmakiola.de/makiolaj/calendula/actions/workflows/ci.yaml/badge.svg?branch=main" alt="CI"></a>
 <img src="https://img.shields.io/badge/Android-10%2B-3DDC84?logo=android&logoColor=white" alt="Android 10+">
 <img src="https://img.shields.io/badge/Kotlin-Compose-7F52FF?logo=kotlin&logoColor=white" alt="Kotlin + Compose">
 <img src="https://img.shields.io/badge/Material%203-Expressive-4285F4" alt="Material 3 Expressive">
@@ -18,18 +18,15 @@ Reads, writes, and reminds — on top of the system calendar, with zero network
 <p>
 <a href="https://f-droid.org/packages/de.jeanlucmakiola.calendula/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="56"></a>
 &nbsp;
-<a href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/jlmakiola/calendula"><img src="https://github.com/ImranR98/Obtainium/blob/main/assets/graphics/badge_obtainium.png?raw=true" alt="Get it on Obtainium" height="56"></a>
-&nbsp;
 <a href="https://ko-fi.com/jeanlucmakiola"><img src="https://storage.ko-fi.com/cdn/brandasset/v2/support_me_on_kofi_badge_beige.png" alt="Support me on Ko-fi" height="56"></a>
 </p>
 
 <p>
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/01-week.png" width="16%" alt="Week view">&nbsp;
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/01-week.png" width="19%" alt="Week view">&nbsp;
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/02-month.png" width="16%" alt="Month view">&nbsp;
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/02-month.png" width="19%" alt="Month view">&nbsp;
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/03-day.png" width="16%" alt="Day view">&nbsp;
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/04-detail.png" width="19%" alt="Event detail">&nbsp;
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/04-detail.png" width="16%" alt="Event detail">&nbsp;
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/05-edit.png" width="19%" alt="Event form">&nbsp;
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/05-agenda.png" width="16%" alt="Agenda view">&nbsp;
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/06-onboarding.png" width="19%" alt="Reminder onboarding">
-<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/06-onboarding.png" width="16%" alt="Reminder onboarding">
 </p>
 
 </div>
@@ -71,38 +68,24 @@ database, no sync stack reinvented.
 
 - Real Material 3 Expressive throughout — dynamic color (Android 12+),
   expressive motion and shapes, light/dark theme
-- English and German UI plus community translations (Spanish, French, Italian,
+- German and English UI, per-app language setting — and [open to community
-  Polish, and more in progress), per-app language setting — and [open to more
+  translations](#-translations)
-  languages](#-translations)
 - **Zero telemetry, zero analytics, no internet permission** — your data
   never leaves the device
 
 ## 📦 Install
 
-Pick whichever channel you already use — they all install the same app:
-
-| Channel | Updates | Notes |
-| --- | --- | --- |
-| [Official F-Droid](#f-droid-recommended) | On F-Droid's build schedule | Recommended; no extra setup |
-| [Self-hosted F-Droid repo](#self-hosted-f-droid-repo-fastest-updates) | Minutes after a release | Fastest; needs the repo added once |
-| [Codeberg release / Obtainium](#codeberg-release--obtainium) | Per release | Plain APK download, or automated by Obtainium |
-| [Google Play](#google-play-coming-soon) | — | Coming soon |
-| [Build from source](#build-from-source) | Whenever you build | Full control |
-
 ### F-Droid (recommended)
 
 Calendula is on the **official [F-Droid](https://f-droid.org) repository** —
 just search for **Calendula** in any F-Droid client, or
 [install it from f-droid.org](https://f-droid.org/packages/de.jeanlucmakiola.calendula/).
 
-F-Droid rebuilds from source on its own schedule, so a new version usually
+### Self-hosted repo (latest builds)
-shows up there a few days after release.
 
-### Self-hosted F-Droid repo (fastest updates)
+New versions are built, signed, and published to a self-hosted repository the
-
+moment each tag lands — usually a few days ahead of the official repo, which
-Every release is built, signed, and published to a self-hosted F-Droid
+rebuilds on F-Droid's own schedule. Add it for the freshest builds:
-repository as part of the release pipeline, so it lands there first. Add it once
-and your F-Droid client handles updates from then on:
 
 1. In your F-Droid client, open *Settings → Repositories → Add* (or open the
    link below on your phone):
@@ -117,71 +100,19 @@ and your F-Droid client handles updates from then on:
 
 2. Refresh, search for **Calendula**, install.
 
-### Codeberg release / Obtainium
+Both channels share the same signing key, so you can switch between them
-
+without reinstalling. Or build from source — see below.
-If you'd rather not use F-Droid at all, every release is also published on
-**[Codeberg](https://codeberg.org/jlmakiola/calendula/releases)** with the
-signed APK (`calendula_vX.Y.Z.apk`) and a `.sha256` checksum attached — download
-and install it directly.
-
-For automatic updates from that channel, use
-**[Obtainium](https://github.com/ImranR98/Obtainium)** — on the phone,
-**[add Calendula in one tap](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://codeberg.org/jlmakiola/calendula)**,
-or do it by hand: *Add App* → paste `https://codeberg.org/jlmakiola/calendula`
-→ *Add*. Either way, Obtainium tracks the releases and prompts you when a new
-one appears.
-
-### Google Play (coming soon)
-
-Calendula is on its way to Google Play as an additional channel. It isn't live
-yet — this section gets a link once it is. Play builds will be signed with
-Google's key rather than mine, so switching between Play and any other channel
-will require an uninstall.
-
-> **Testers wanted.** Play requires a round of closed testing before the app can
-> go public, and I'm still looking for testers. If you'd like to help, email
-> **[business@jeanlucmakiola.de](mailto:business@jeanlucmakiola.de)** with the
-> Google account address you want to use — that address is what I need to add you
-> to the closed test.
-
-### Build from source
-
-The build is a plain Gradle build with no proprietary dependencies — see
-**[docs/BUILDING.md](docs/BUILDING.md)** (note the `floret-kit` submodule).
-
-<sub>Official F-Droid, the self-hosted repo, and the Codeberg releases all share
-the same signing key, so you can switch freely between them without
-reinstalling.</sub>
 
 ## 📚 Documentation
 
-- **[Contributing](CONTRIBUTING.md)** — how to report, propose, and patch
 - **[Building from source](docs/BUILDING.md)** — requirements and Gradle tasks
 - **[Architecture](docs/ARCHITECTURE.md)** — the layered design and key pipelines
-- **[Milestones](https://codeberg.org/jlmakiola/calendula/milestones)** — what's shipped and what's next
+- **[Roadmap](.planning/ROADMAP.md)** — what's shipped and what's next
-
-## 🤝 Contributing
-
-Bug reports, ideas, and patches are all welcome on
-**[Codeberg](https://codeberg.org/jlmakiola/calendula/issues)**.
-
-The short version: **start with an issue.** Features get a yes-or-no before they
-get code, and both features and bugs are assigned a milestone whose
-`release/vX.Y.Z` branch your pull request then targets. Typo and docs fixes can
-skip straight to a pull request. Translations don't go through pull requests at
-all — [Weblate owns them](#-translations).
-
-Read **[CONTRIBUTING.md](CONTRIBUTING.md)** before writing code: it covers the
-workflow, the build (note the `floret-kit` submodule), and the architectural
-rules a change is reviewed against.
 
 ## 🌍 Translations
 
-Calendula ships in English and German, with community translations in Arabic,
+Calendula ships in German and English, and you're warmly invited to add your
-Chinese, French, Italian, Polish, Portuguese, Russian, and Spanish at varying
+language. Translations are managed on a self-hosted **Weblate**:
-degrees of completeness — partial is fine, untranslated strings simply fall back
-to English. You're warmly invited to add or finish your language. Translations
-are managed on a self-hosted **Weblate**:
 
 **→ [Help translate Calendula](https://weblate.dev.jeanlucmakiola.de/engage/calendula/)**
 

app/build.gradle.kts

@@ -28,8 +28,8 @@ android {
         // which builds this version and then creates the matching vX.Y.Z tag +
         // release itself (versionCode is pinned to MAJOR*10000 + MINOR*100 +
         // PATCH from versionName, e.g. 2.7.2 -> 20702). See docs/RELEASING.md.
-        versionCode = 21800
+        versionCode = 21500
-        versionName = "2.18.0"
+        versionName = "2.15.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -113,13 +113,10 @@ android {
     lint {
         // Community translations are expected to be partial — a missing string
         // falls back to the English base at runtime — so don't fail the build on
-        // it. Likewise a translated <plurals> may not fill every CLDR quantity
+        // it. Stale/extra keys (ExtraTranslation) stay fatal; scripts/
-        // form its locale defines (e.g. Arabic needs "zero"); the missing form
-        // falls back to "other" at runtime, so MissingQuantity is informational
-        // too. Stale/extra keys (ExtraTranslation) stay fatal; scripts/
         // check_translations.py guards the same invariants with clearer,
         // translator-facing messages.
-        informational += listOf("MissingTranslation", "MissingQuantity")
+        informational += "MissingTranslation"
     }
 
     testOptions {

app/proguard-rules.pro

@@ -38,15 +38,3 @@
 # SessionWorker never ran, and widgets were stuck on their loading layout
 # (a blank spinner) in release builds. Keep every InputMerger's name + ctor.
 -keep class * extends androidx.work.InputMerger { <init>(...); }
-
-# Glance identifies a widget by its GlanceAppWidget subclass's *canonical name*:
-# GlanceAppWidgetManager persists a providerName -> receivers map under that
-# string, and `updateAll` looks the widget's app-widget ids up through it. Under
-# R8 full mode (AGP 9 default) MonthWidget and AgendaWidget — same supertype,
-# same overrides, no distinguishing members — were horizontally merged into one
-# class, so both receivers registered under the *same* provider name and
-# `AgendaWidget().updateAll()` resolved the month widget's id too, redrawing a
-# placed month widget as the agenda one on the next data change (#89). Keeping
-# the real names also survives app updates, which would otherwise renumber the
-# obfuscated name and orphan the stored mapping.
--keep class * extends androidx.glance.appwidget.GlanceAppWidget

app/src/androidTest/java/de/jeanlucmakiola/calendula/data/calendar/CalendarRepositorySmokeTest.kt

@@ -9,7 +9,6 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import com.google.common.truth.Truth.assertThat
 import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
-import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
@@ -32,12 +31,7 @@ class CalendarRepositorySmokeTest {
         val store: DataStore<Preferences> = PreferenceDataStoreFactory.create(
             produceFile = { context.cacheDir.resolve("smoke_test_prefs.preferences_pb") },
         )
-        return CalendarRepositoryImpl(
+        return CalendarRepositoryImpl(dataSource, CalendarPrefs(store), Dispatchers.IO)
-            dataSource,
-            CalendarPrefs(store),
-            SettingsPrefs(store),
-            Dispatchers.IO,
-        )
     }
 
     @Test

app/src/main/AndroidManifest.xml

@@ -33,14 +33,6 @@
         android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
-    <!--
-      A reboot clears every pending alarm, including the one holding the next
-      reminder. Now that the app schedules that alarm itself (#75) rather than
-      leaning on the provider's, it has to hear about the reboot to re-arm it —
-      otherwise reminders simply stop after a restart.
-    -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
     <!-- Package visibility (Android 11+): without this, getLaunchIntentForPackage
          returns null and the calendar manager's per-account "manage" button can't
          open the source sync app (DAVx5, ICSx5, Google Calendar, …). The LAUNCHER
@@ -71,9 +63,10 @@
             android:exported="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize">
-            <!-- The MAIN/LAUNCHER entry (the launcher icon + its label) lives on
+            <intent-filter>
-                 the two <activity-alias> below, so the app name can be switched at
+                <action android:name="android.intent.action.MAIN" />
-                 runtime (issue #44). MainActivity keeps every other filter. -->
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
 
             <!-- Be selectable as the system calendar app. Android has no API for
                  an app to make itself the default, so registering the filters
@@ -120,28 +113,6 @@
                 <data android:mimeType="text/x-vcalendar" />
                 <data android:mimeType="application/ics" />
             </intent-filter>
-            <!-- Same .ics/.vcs data arriving mislabelled as a generic download —
-                 application/octet-stream — the way many mail clients, browsers and
-                 file managers hand off attachments. Matched by file extension, so
-                 this stays a separate filter: a pathPattern here must not narrow
-                 the MIME-typed VIEW filter above (that one has no path and must
-                 keep matching regardless of name). The import handler ignores the
-                 MIME type, so a let-through octet-stream .ics imports normally.
-                 Best-effort: pathPattern is reliable for file:// (and content://
-                 whose path carries the filename); content:// URIs that expose no
-                 name still fall back to the MIME-typed filter above. -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:host="*" />
-                <data android:mimeType="application/octet-stream" />
-                <data android:pathPattern=".*\\.ics" />
-                <data android:pathPattern=".*\\.vcs" />
-            </intent-filter>
-
             <!-- Receive a .ics/.vcs shared from another app (same MIME set). -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -153,13 +124,11 @@
 
             <!-- Let another app or widget (e.g. the Todo Agenda widget) launch us
                  to create a new event, the way the AOSP calendar accepts it:
-                 ACTION_INSERT on the events *dir* mime type, carrying the new
+                 ACTION_INSERT on the events dir mime type, carrying the new
                  event's fields as CalendarContract extras
                  (MainActivity.insertFormOrNull, issue #30). ACTION_EDIT on the
                  dir mime is AOSP's "edit a new event" — i.e. create — so it maps
-                 to the same prefilled create form. (The far more common *item*-
+                 to the same prefilled create form. -->
-                 typed INSERT — the form the Android docs' example and apps like
-                 DB Navigator use — is the item filter below, issue #74.) -->
             <intent-filter>
                 <action android:name="android.intent.action.INSERT" />
                 <action android:name="android.intent.action.EDIT" />
@@ -167,31 +136,14 @@
                 <data android:mimeType="vnd.android.cursor.dir/event" />
             </intent-filter>
 
-            <!-- Create or edit an event another app/assistant/widget points at,
+            <!-- Edit an existing event another app/assistant/widget points at:
-                 addressed by the provider's *item* MIME type. Three actions share
+                 ACTION_EDIT on content://com.android.calendar/events/<id>, the way
-                 this filter, told apart at runtime by the intent's data:
+                 AOSP fires it. Opens the occurrence in the edit form (not the
-
+                 read-only detail — that's the VIEW filter above). Matched by the
-                 • ACTION_INSERT — create. This is the form the Android docs'
+                 provider's item MIME type, like the VIEW filter. The occurrence's
-                   "insert an event" example and many apps use
+                 times ride as EXTRA_EVENT_BEGIN_TIME / EXTRA_EVENT_END_TIME when
-                   (setType("vnd.android.cursor.item/event")), e.g. DB Navigator's
+                 supplied (MainActivity.editEventKeyOrNull). -->
-                   "Save to calendar". The dir-typed filter above alone missed it,
-                   so Calendula never showed in the chooser — and, when it was the
-                   only calendar app, the intent resolved to nothing (issue #74).
-                 • ACTION_INSERT_OR_EDIT — the third "add to calendar" action AOSP
-                   and Google Calendar register; a create, or an edit when it
-                   carries an event id.
-                 • ACTION_EDIT — edit the existing event at
-                   content://com.android.calendar/events/<id> (an id-less EDIT is a
-                   create). Opens the occurrence in the edit form, not the
-                   read-only detail — that's the VIEW filter above.
-
-                 Create fields ride as CalendarContract extras; an edit's
-                 occurrence times ride as EXTRA_EVENT_BEGIN_TIME /
-                 EXTRA_EVENT_END_TIME when supplied (MainActivity.insertFormOrNull
-                 / editEventKeyOrNull). -->
             <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
                 <action android:name="android.intent.action.EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/event" />
@@ -213,48 +165,12 @@
                 <data android:mimeType="vnd.android.cursor.item/event" />
             </intent-filter>
 
+            <!-- Launcher long-press shortcuts (e.g. "New event"). -->
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
-        <!-- Launcher entry for MainActivity, split into two aliases so the app's
-             launcher name can be switched at runtime between "Calendula" and
-             "Calendar" (issue #44). Exactly one is enabled at a time; the app
-             flips them via PackageManager.setComponentEnabledSetting
-             (LauncherNameManager). The shortcuts meta-data lives here, not on
-             MainActivity, because static shortcuts are published by whichever
-             component owns the MAIN/LAUNCHER filter. -->
-        <activity-alias
-            android:name=".DefaultNameAlias"
-            android:enabled="true"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:targetActivity=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity-alias>
-        <activity-alias
-            android:name=".CalendarNameAlias"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name_calendar_alias"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:targetActivity=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity-alias>
-
         <!-- Standalone surface for a captured crash report. MainActivity routes
              here on a startup crash-loop, so it stays clear of the app's Hilt
              graph and Compose content. Not exported: launched only by us. -->
@@ -278,22 +194,17 @@
             </intent-filter>
         </service>
 
-        <!-- Reminder delivery is the app's own (#75): it plans the alarms from
+        <!-- The provider broadcasts EVENT_REMINDER at reminder time but posts
-             Instances + Reminders instead of waiting for the provider's
+             no notification itself — a calendar app must (v1.4, Etar model).
-             EVENT_REMINDER broadcast, which OEM-modified providers demonstrably
+             Exported: the broadcast arrives from the provider's process. -->
-             retarget or never send. This receiver takes our scan alarm plus
-             every outside event that invalidates it — boot and package-replace
-             wipe pending alarms, and a clock or timezone change moves every
-             reminder relative to the one that is armed.
-             Exported: the system broadcasts arrive from outside the app. -->
         <receiver
-            android:name=".data.reminders.ReminderScheduleReceiver"
+            android:name=".data.reminders.EventReminderReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.EVENT_REMINDER" />
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <data
-                <action android:name="android.intent.action.TIME_SET" />
+                    android:host="com.android.calendar"
-                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+                    android:scheme="content" />
             </intent-filter>
         </receiver>
 

app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt

@@ -4,12 +4,9 @@ import android.app.Application
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.android.HiltAndroidApp
 import de.jeanlucmakiola.calendula.data.backup.BackupScheduler
-import de.jeanlucmakiola.calendula.data.calendar.CalendarVisibilityReconciler
 import de.jeanlucmakiola.calendula.data.backup.BackupWorker
 import de.jeanlucmakiola.calendula.data.contacts.SpecialDatesScheduler
 import de.jeanlucmakiola.calendula.data.contacts.SpecialDatesSyncWorker
-import de.jeanlucmakiola.calendula.data.reminders.ReminderMaintenanceScheduler
-import de.jeanlucmakiola.calendula.data.reminders.ReminderMaintenanceWorker
 import de.jeanlucmakiola.floret.crash.CrashConfig
 import de.jeanlucmakiola.floret.crash.CrashReporter
 import kotlinx.coroutines.CoroutineScope
@@ -42,37 +39,6 @@ class CalendulaApp : Application() {
         )
         reconcileAutoBackup()
         reconcileSpecialDates()
-        reconcileCalendarVisibility()
-        startReminderDelivery()
-    }
-
-    /**
-     * Bring reminder delivery up with the process (#75): a scan re-arms whatever
-     * the system dropped and posts what a missed alarm still owes, then the
-     * provider watch keeps edits re-planned. The daily worker is the backstop.
-     */
-    private fun startReminderDelivery() {
-        val deps = EntryPointAccessors.fromApplication(
-            this, ReminderMaintenanceWorker.Deps::class.java,
-        )
-        val scanner = deps.reminderScanner()
-        scanner.startWatchingProvider()
-        scanner.scanInBackground()
-        ReminderMaintenanceScheduler.apply(this)
-    }
-
-    /**
-     * Flush any calendar switch-off not yet written to `Calendars.VISIBLE`,
-     * including the set inherited from the retired app-local model (#75). A
-     * no-op in the steady state; `RootScreen` re-runs it after a later grant.
-     */
-    private fun reconcileCalendarVisibility() {
-        val deps = EntryPointAccessors.fromApplication(
-            this, CalendarVisibilityReconciler.Deps::class.java,
-        )
-        CoroutineScope(SupervisorJob() + Dispatchers.Default).launch {
-            deps.calendarVisibilityReconciler().run()
-        }
     }
 
     /**
@@ -95,8 +61,10 @@ class CalendulaApp : Application() {
 
     /**
      * Re-arm (or cancel) the daily special-dates reconcile from the saved
-     * settings, like [reconcileAutoBackup]. The on-open refresh is RootScreen's
+     * settings on every launch — like [reconcileAutoBackup], this cancels
-     * ON_RESUME trigger, so no immediate run is needed here.
+     * orphaned work after the feature is turned off and re-schedules after a
+     * reinstall. The foreground trigger (RootScreen ON_RESUME) does the on-open
+     * refresh, so no immediate run is needed here.
      */
     private fun reconcileSpecialDates() {
         val deps = EntryPointAccessors.fromApplication(this, SpecialDatesSyncWorker.Deps::class.java)

app/src/main/java/de/jeanlucmakiola/calendula/MainActivity.kt

@@ -2,11 +2,9 @@ package de.jeanlucmakiola.calendula
 
 import android.content.Context
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.provider.CalendarContract
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -14,7 +12,6 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -32,14 +29,11 @@ import de.jeanlucmakiola.calendula.domain.EventForm
 import de.jeanlucmakiola.calendula.domain.buildInsertEventForm
 import de.jeanlucmakiola.calendula.ui.RootScreen
 import de.jeanlucmakiola.calendula.ui.common.LocalShowHourLines
-import de.jeanlucmakiola.calendula.ui.common.LocalTimelineZoom
-import de.jeanlucmakiola.calendula.ui.common.rememberTimelineZoom
 import de.jeanlucmakiola.calendula.ui.common.LocalSoftenColors
 import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
 import de.jeanlucmakiola.calendula.ui.WidgetNavRequest
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
 import de.jeanlucmakiola.calendula.ui.detail.EventDetailViewModel.Companion.NO_OCCURRENCE_TIME
-import de.jeanlucmakiola.calendula.ui.edit.ImportSource
 import de.jeanlucmakiola.floret.components.DebugRibbon
 import de.jeanlucmakiola.calendula.ui.crash.CrashReportActivity
 import de.jeanlucmakiola.calendula.domain.FontRole
@@ -56,17 +50,9 @@ import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Clock
 import kotlin.time.Instant
 
-/** A prefilled create form from an external launch, with the source it came from. */
-private data class InsertRequest(val form: EventForm, val source: ImportSource)
-
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    // Which of light/dark the system bars are drawn for. The styles installed
-    // in onCreate read this field live, so androidx's config-change replay
-    // picks up the in-app override instead of the night resource qualifier.
-    private var systemBarsDark = false
-
     // The occurrence a reminder notification was tapped for (eventId, begin,
     // end — the detail screen's key shape). singleTop + onNewIntent route a
     // tap into the running activity; CalendarHost consumes and clears it.
@@ -83,7 +69,7 @@ class MainActivity : AppCompatActivity() {
     // A prefilled new-event form from an external ACTION_INSERT launch (another
     // app/widget asking us to create an event, issue #30). Consumed once by
     // CalendarHost, which opens it in the create form for review.
-    private var requestedInsert by mutableStateOf<InsertRequest?>(null)
+    private var requestedInsertForm by mutableStateOf<EventForm?>(null)
 
     // An external "edit this event" (ACTION_EDIT on content://.../events/<id>):
     // opens the occurrence in the edit form. Same occurrence-key shape as the
@@ -110,13 +96,11 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
-        systemBarsDark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
+        enableEdgeToEdge()
-            Configuration.UI_MODE_NIGHT_YES
-        applyEdgeToEdge()
         requestedDetailKey = intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull()
         requestedNav = intent.navRequestOrNull()
         requestedImportUri = intent.importUriOrNull()
-        requestedInsert = intent.insertRequestOrNull()
+        requestedInsertForm = intent.insertFormOrNull()
         requestedEditKey = intent.editEventKeyOrNull()
         if (CrashReporter.shouldPrompt(this)) pendingCrashReport = CrashReporter.pendingReport(this)
         setContent {
@@ -129,14 +113,6 @@ class MainActivity : AppCompatActivity() {
                 ThemeMode.LIGHT -> false
                 ThemeMode.DARK -> true
             }
-            // onCreate can only see the night resource qualifier, not the in-app
-            // override — re-apply from the resolved theme so the bar icons follow
-            // the app's light/dark choice.
-            DisposableEffect(darkTheme) {
-                systemBarsDark = darkTheme
-                applyEdgeToEdge()
-                onDispose {}
-            }
             // The app-wide clock convention: the time-format preference resolved
             // against the device's 24-hour system setting, provided once here so
             // every time label reads it via LocalUse24HourFormat.
@@ -149,13 +125,6 @@ class MainActivity : AppCompatActivity() {
             // re-import stamp AppFontSettings carries, so replacing the file
             // behind an active "custom" token still refreshes — changes;
             // "system for both" returns the default scale untouched.
-            // The timeline scale plus the pinch in flight over it (#56). Held
-            // here, above the calendar views, so a zoom survives paging between
-            // weeks and switching between the week and day view.
-            val timelineZoom = rememberTimelineZoom(
-                stored = settings.timelineScale,
-                onPersist = settingsViewModel::setTimelineScale,
-            )
             val fonts by settingsViewModel.fontState.collectAsStateWithLifecycle()
             val typography = remember(fonts, context) {
                 calendulaTypography(
@@ -172,7 +141,6 @@ class MainActivity : AppCompatActivity() {
                     CompositionLocalProvider(
                         LocalUse24HourFormat provides use24Hour,
                         LocalShowHourLines provides settings.showHourLines,
-                        LocalTimelineZoom provides timelineZoom,
                         LocalSoftenColors provides settings.softenColors,
                     ) {
                         RootScreen(
@@ -183,9 +151,8 @@ class MainActivity : AppCompatActivity() {
                             onWidgetNavConsumed = { requestedNav = null },
                             requestedImportUri = requestedImportUri,
                             onImportConsumed = { requestedImportUri = null },
-                            requestedInsertForm = requestedInsert?.form,
+                            requestedInsertForm = requestedInsertForm,
-                            requestedInsertSource = requestedInsert?.source ?: ImportSource.Insert,
+                            onInsertConsumed = { requestedInsertForm = null },
-                            onInsertConsumed = { requestedInsert = null },
                             requestedEditKey = requestedEditKey,
                             onEditKeyConsumed = { requestedEditKey = null },
                         )
@@ -214,19 +181,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Applies the transparent edge-to-edge bars for the current [systemBarsDark].
-     * Both scrims are transparent because API 29+ enforces its own contrast and
-     * ignores them anyway.
-     */
-    private fun applyEdgeToEdge() {
-        val transparent = android.graphics.Color.TRANSPARENT
-        enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.auto(transparent, transparent) { systemBarsDark },
-            navigationBarStyle = SystemBarStyle.auto(transparent, transparent) { systemBarsDark },
-        )
-    }
-
     override fun onResume() {
         super.onResume()
         // Reaching a running UI means startup succeeded; reset the loop trail.
@@ -238,7 +192,7 @@ class MainActivity : AppCompatActivity() {
         (intent.detailKeyOrNull() ?: intent.viewEventKeyOrNull())?.let { requestedDetailKey = it }
         intent.navRequestOrNull()?.let { requestedNav = it }
         intent.importUriOrNull()?.let { requestedImportUri = it }
-        intent.insertRequestOrNull()?.let { requestedInsert = it }
+        intent.insertFormOrNull()?.let { requestedInsertForm = it }
         intent.editEventKeyOrNull()?.let { requestedEditKey = it }
     }
 
@@ -265,22 +219,17 @@ class MainActivity : AppCompatActivity() {
      * (issue #30), or `ACTION_EDIT` with no concrete event id (AOSP's "edit a new
      * event", i.e. create). The new event's fields ride as CalendarContract
      * extras; anything omitted falls back to the in-app "new event" defaults in
-     * [buildInsertEventForm]. An intent that names no end time leaves the length
+     * [buildInsertEventForm].
-     * to the default-duration setting ([ImportSource.InsertOpenEnded], #54).
      */
-    private fun Intent.insertRequestOrNull(): InsertRequest? {
+    private fun Intent.insertFormOrNull(): EventForm? {
-        // ACTION_EDIT / ACTION_INSERT_OR_EDIT on an existing event route to the
+        // ACTION_EDIT on an existing event routes to the edit form instead
-        // edit form instead ([editEventKeyOrNull]); an id-less one is a create,
+        // ([editEventKeyOrNull]); only an id-less EDIT is a create.
-        // as is any plain ACTION_INSERT.
         val isCreate = action == Intent.ACTION_INSERT ||
-            ((action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT_OR_EDIT) &&
+            (action == Intent.ACTION_EDIT && editEventKeyOrNull() == null)
-                editEventKeyOrNull() == null)
         if (!isCreate) return null
-        val beginMillis = longExtraOrNull(CalendarContract.EXTRA_EVENT_BEGIN_TIME)
+        return buildInsertEventForm(
-        val endMillis = longExtraOrNull(CalendarContract.EXTRA_EVENT_END_TIME)
+            beginMillis = longExtraOrNull(CalendarContract.EXTRA_EVENT_BEGIN_TIME),
-        val form = buildInsertEventForm(
+            endMillis = longExtraOrNull(CalendarContract.EXTRA_EVENT_END_TIME),
-            beginMillis = beginMillis,
-            endMillis = endMillis,
             isAllDay = getBooleanExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, false),
             title = getStringExtra(CalendarContract.Events.TITLE),
             description = getStringExtra(CalendarContract.Events.DESCRIPTION),
@@ -289,10 +238,6 @@ class MainActivity : AppCompatActivity() {
             zone = TimeZone.currentSystemDefault(),
             now = Clock.System.now(),
         )
-        // An end the intent didn't name — or one [buildInsertEventForm] drops for
-        // landing before the start — leaves the length to the setting.
-        val namesEnd = beginMillis != null && endMillis != null && endMillis >= beginMillis
-        return InsertRequest(form, if (namesEnd) ImportSource.Insert else ImportSource.InsertOpenEnded)
     }
 
     /** A Long extra's value, or null when the extra is absent. */
@@ -399,11 +344,10 @@ class MainActivity : AppCompatActivity() {
      * occurrence's times as `EXTRA_EVENT_BEGIN_TIME` / `EXTRA_EVENT_END_TIME`
      * when it has them, otherwise we carry [NO_OCCURRENCE_TIME] and
      * [EventEditViewModel.openForEdit] falls back to the event row's own
-     * DTSTART/DTEND. An id-less `ACTION_EDIT` — or `ACTION_INSERT_OR_EDIT`, which
+     * DTSTART/DTEND. An id-less `ACTION_EDIT` is a create instead ([insertFormOrNull]).
-     * some apps fire — is a create instead ([insertFormOrNull]).
      */
     private fun Intent.editEventKeyOrNull(): LongArray? {
-        if (action != Intent.ACTION_EDIT && action != Intent.ACTION_INSERT_OR_EDIT) return null
+        if (action != Intent.ACTION_EDIT) return null
         val uri = data ?: return null
         if (uri.host != CALENDAR_PROVIDER_HOST) return null
         val segments = uri.pathSegments

app/src/main/java/de/jeanlucmakiola/calendula/data/appname/LauncherNameManager.kt

@@ -1,109 +0,0 @@
-package de.jeanlucmakiola.calendula.data.appname
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.pm.PackageManager
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/** The launcher label the app shows for itself (issue #44). */
-enum class LauncherName { CALENDULA, CALENDAR }
-
-/** The two launcher aliases declared in the manifest. */
-enum class LauncherAlias { DEFAULT, CALENDAR }
-
-/** One component-enable change in a [aliasWritePlan]. */
-data class AliasStateChange(val alias: LauncherAlias, val enabled: Boolean)
-
-/**
- * Interpret the `CalendarNameAlias` component-enabled state as a [LauncherName].
- * Only [PackageManager.COMPONENT_ENABLED_STATE_ENABLED] means the "Calendar"
- * name is active; `DEFAULT` (never toggled) and `DISABLED` both resolve to the
- * manifest default, "Calendula".
- */
-fun launcherNameFor(calendarAliasState: Int): LauncherName =
-    if (calendarAliasState == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
-        LauncherName.CALENDAR
-    } else {
-        LauncherName.CALENDULA
-    }
-
-/**
- * The ordered enable/disable steps to switch the launcher name to [target].
- * Always **enables the target alias first, then disables the other** — the two
- * `setComponentEnabledSetting` calls are not atomic, and this ordering means the
- * only transient the launcher can observe is a harmless two-entry state, never a
- * zero-entry one (which would briefly drop the app from the launcher).
- */
-fun aliasWritePlan(target: LauncherName): List<AliasStateChange> = when (target) {
-    LauncherName.CALENDAR -> listOf(
-        AliasStateChange(LauncherAlias.CALENDAR, enabled = true),
-        AliasStateChange(LauncherAlias.DEFAULT, enabled = false),
-    )
-    LauncherName.CALENDULA -> listOf(
-        AliasStateChange(LauncherAlias.DEFAULT, enabled = true),
-        AliasStateChange(LauncherAlias.CALENDAR, enabled = false),
-    )
-}
-
-/**
- * Switches the app's launcher label between "Calendula" and "Calendar" by
- * enabling/disabling the two `<activity-alias>` components (issue #44). The
- * component-enabled state is the single source of truth — there is no persisted
- * preference — so [current] reads it straight from [PackageManager] and the two
- * always agree.
- *
- * The decision logic lives in the pure [launcherNameFor] / [aliasWritePlan]
- * functions above (JVM-tested); this class is only the thin framework seam.
- */
-@Singleton
-class LauncherNameManager @Inject constructor(
-    @ApplicationContext private val context: Context,
-) {
-    private val packageManager: PackageManager get() = context.packageManager
-
-    // The class portion is namespace-qualified (suffix-free), the package portion
-    // is the applicationId (which carries the .debug / .releasetest suffix). The
-    // manifest's ".CalendarNameAlias" resolves its class against the namespace, so
-    // the real component is <namespace>.CalendarNameAlias registered under the
-    // suffixed applicationId. Do NOT use ComponentName(context, ".CalendarNameAlias")
-    // — its leading-dot form prepends the applicationId to the class too, producing
-    // "<appId>.CalendarNameAlias" and failing on every debug / releaseTest build.
-    private fun component(alias: LauncherAlias): ComponentName {
-        val simpleName = when (alias) {
-            LauncherAlias.DEFAULT -> "DefaultNameAlias"
-            LauncherAlias.CALENDAR -> "CalendarNameAlias"
-        }
-        return ComponentName(context.packageName, "$NAMESPACE.$simpleName")
-    }
-
-    /** The launcher name currently in effect. */
-    fun current(): LauncherName =
-        launcherNameFor(packageManager.getComponentEnabledSetting(component(LauncherAlias.CALENDAR)))
-
-    /** Switch the launcher name to [name] (no-op cost if already active). */
-    fun set(name: LauncherName) {
-        for (change in aliasWritePlan(name)) {
-            val state = if (change.enabled) {
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-            } else {
-                PackageManager.COMPONENT_ENABLED_STATE_DISABLED
-            }
-            packageManager.setComponentEnabledSetting(
-                component(change.alias),
-                state,
-                PackageManager.DONT_KILL_APP,
-            )
-        }
-    }
-
-    private companion object {
-        /**
-         * The app's namespace (R-class package) — NOT `applicationId`, which
-         * carries the build-type suffix. Kept in sync with `namespace` in
-         * `app/build.gradle.kts`.
-         */
-        const val NAMESPACE = "de.jeanlucmakiola.calendula"
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/AllDayReminderEncoding.kt

@@ -1,10 +1,11 @@
 package de.jeanlucmakiola.calendula.data.calendar
 
-import de.jeanlucmakiola.calendula.domain.reminders.allDayLeadDays
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.ZoneId
 import java.time.ZoneOffset
+import java.time.temporal.ChronoUnit
 
 /**
  * Translates an all-day reminder between the **semantic** lead time the UI
@@ -72,13 +73,19 @@ internal fun nextYearlyOccurrence(month: Int, day: Int, today: LocalDate): Local
 
 /**
  * Recover the semantic whole-day lead time from a raw all-day reminder
- * [rawMinutes] — the inverse of [toProviderAllDayMinutes], for the form and the
+ * [rawMinutes]. Keys off the **local date** of the encoded fire instant, so it
- * detail screen. Delegates to [allDayLeadDays], so the day displayed is the day
+ * returns the right day count regardless of which [timeOfDayMinutes] wrote the
- * the reminder actually fires on.
+ * row — including pre-feature rows (raw multiples of 1440, fired at UTC midnight)
+ * and rows written under a different timezone. A negative [rawMinutes] (fire
+ * after DTSTART) folds to day 0.
  */
 internal fun fromProviderAllDayMinutes(
     rawMinutes: Int,
     startDate: LocalDate,
     zone: ZoneId,
-    timeOfDayMinutes: Int,
+): Int {
-): Int = allDayLeadDays(rawMinutes, startDate, zone, timeOfDayMinutes).toInt() * MINUTES_PER_DAY
+    val utcMidnight = startDate.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli()
+    val fireLocalDate = Instant.ofEpochMilli(utcMidnight - rawMinutes * MILLIS_PER_MINUTE)
+        .atZone(zone).toLocalDate()
+    return ChronoUnit.DAYS.between(fireLocalDate, startDate).toInt() * MINUTES_PER_DAY
+}

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarDataSource.kt

@@ -54,12 +54,7 @@ import javax.inject.Singleton
 interface CalendarDataSource {
     fun calendars(): List<CalendarSource>
     fun instances(beginMillis: Long, endMillis: Long): List<EventInstance>
-    /**
+    fun eventDetail(eventId: Long): EventDetail?
-     * [allDayReminderTimeMinutes]: the hour all-day reminders fire at, needed to
-     * decode their stored offsets back to whole-day lead times (see
-     * [fromProviderAllDayMinutes]).
-     */
-    fun eventDetail(eventId: Long, allDayReminderTimeMinutes: Int): EventDetail?
 
     /**
      * Master/one-off events whose title, description or location contains
@@ -115,28 +110,6 @@ interface CalendarDataSource {
     /** Permanently delete a local calendar the app owns, with all its events. */
     fun deleteCalendar(id: Long)
 
-    /**
-     * Show or hide the calendar device-wide by writing `Calendars.VISIBLE` — the
-     * app's one visibility model (#75), which also gates its reminders. One of
-     * the three columns the platform documents as app-writable, and device-local.
-     */
-    fun setCalendarVisible(id: Long, visible: Boolean)
-
-    /**
-     * Whether one calendar is switched on at system level, without reading every
-     * row — for the reminder gate, which sees only a calendar id. Null when the
-     * answer can't be had: no row, or no read permission.
-     */
-    fun isCalendarVisible(id: Long): Boolean?
-
-    /**
-     * Whether the app holds `WRITE_CALENDAR`, i.e. may write
-     * [setCalendarVisible] at all. Read-only users (READ granted, WRITE denied)
-     * keep their calendar switches app-side instead — see
-     * [de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs.pendingDisabledCalendarIds].
-     */
-    fun canWriteCalendars(): Boolean
-
     /**
      * Create a local calendar tagged as the special-dates mirror for [type]
      * (a marker in `CAL_SYNC2`); returns its `Calendars._ID`. Otherwise a normal
@@ -400,37 +373,6 @@ class AndroidCalendarDataSource @Inject constructor(
         if (deleted == 0) throw WriteFailedException("delete calendar id=$id")
     }
 
-    /**
-     * Addressed by appended id on the plain (non-sync-adapter) Calendars URI, one
-     * calendar per call. Both parts are load-bearing:
-     * `CalendarProvider2.updateInTransaction` skips the dirty marking and the
-     * `checkNextAlarm()` reschedule unless the selection is `_id=…`, and the
-     * plain URI is what makes the write apply to synced calendars too.
-     */
-    override fun setCalendarVisible(id: Long, visible: Boolean) {
-        val values = ContentValues().apply {
-            put(CalendarContract.Calendars.VISIBLE, if (visible) 1 else 0)
-        }
-        val rows = resolver.update(
-            ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, id),
-            values, null, null,
-        )
-        if (rows == 0) throw WriteFailedException("set calendar visibility id=$id")
-    }
-
-    override fun isCalendarVisible(id: Long): Boolean? {
-        if (!hasCalendarPermission()) return null
-        return resolver.query(
-            ContentUris.withAppendedId(CalendarContract.Calendars.CONTENT_URI, id),
-            arrayOf(CalendarContract.Calendars.VISIBLE),
-            null, null, null,
-        )?.use { if (it.moveToFirst()) it.getInt(0) != 0 else null }
-    }
-
-    override fun canWriteCalendars(): Boolean =
-        ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CALENDAR) ==
-            PackageManager.PERMISSION_GRANTED
-
     override fun createManagedCalendar(displayName: String, color: Int, type: SpecialDateType): Long {
         val name = displayName.trim().ifEmpty { Fallbacks.UNNAMED_CALENDAR }
         val values = ContentValues().apply {
@@ -616,7 +558,9 @@ class AndroidCalendarDataSource @Inject constructor(
                 // A recurring master's DTSTART is the series start; show its
                 // nearest occurrence instead so the date is the one the user
                 // actually cares about (and sorting reflects it).
-                out += if (base.isRecurring) {
+                val recurring = !reader.getString(SearchProjection.IDX_RRULE).isNullOrEmpty() ||
+                    !reader.getString(SearchProjection.IDX_RDATE).isNullOrEmpty()
+                out += if (recurring) {
                     nearestOccurrenceMillis(base.eventId)?.let { (begin, end) ->
                         base.copy(
                             start = begin.toKotlinInstantFromEpochMillis(),
@@ -666,7 +610,7 @@ class AndroidCalendarDataSource @Inject constructor(
         }
     }
 
-    override fun eventDetail(eventId: Long, allDayReminderTimeMinutes: Int): EventDetail? {
+    override fun eventDetail(eventId: Long): EventDetail? {
         val attendees = queryAttendees(eventId)
         val reminders = queryReminders(eventId)
         return resolver.query(
@@ -675,9 +619,7 @@ class AndroidCalendarDataSource @Inject constructor(
             null, null, null,
         )?.use { c ->
             if (!c.moveToFirst()) null
-            else CursorColumnReader(c).toEventDetailCore(
+            else CursorColumnReader(c).toEventDetailCore(attendees, reminders)
-                attendees, reminders, allDayReminderTimeMinutes,
-            )
         }
     }
 

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarMapper.kt

@@ -31,8 +31,5 @@ internal fun ColumnReader.toCalendarSource(): CalendarSource {
         isManaged = isLocal &&
             getString(CalendarProjection.IDX_MANAGED_MARKER)
                 ?.startsWith(CalendarProjection.MANAGED_MARKER_PREFIX) == true,
-        // NULL is treated as syncing — the harmless default.
-        syncsEvents = isNull(CalendarProjection.IDX_SYNC_EVENTS) ||
-            getInt(CalendarProjection.IDX_SYNC_EVENTS) != 0,
     )
 }

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarRepository.kt

@@ -38,16 +38,6 @@ interface CalendarRepository {
     /** Permanently delete a local calendar the app owns, with all its events. */
     suspend fun deleteCalendar(id: Long)
 
-    /**
-     * Show or hide [ids] device-wide (`Calendars.VISIBLE`), which also gates
-     * their reminders — see [CalendarDataSource.setCalendarVisible]. Written one
-     * at a time, in order; a failure part-way leaves the earlier writes standing.
-     *
-     * Without `WRITE_CALENDAR` the choice is kept app-side instead (see
-     * [de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs.pendingDisabledCalendarIds]).
-     */
-    suspend fun setCalendarsVisible(ids: Collection<Long>, visible: Boolean)
-
     /**
      * Every event of the writable local calendars, ready to serialise into a
      * whole-calendar `.ics` backup (see [CalendarDataSource.exportableEvents]).

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarRepositoryImpl.kt

@@ -16,17 +16,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicLong
 import kotlin.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -53,120 +47,52 @@ class CalendarRepositoryImpl @Inject constructor(
         extraBufferCapacity = 1,
     )
 
-    /**
-     * Bumped on every provider notification, so one tick's calendar read can be
-     * shared by everything that needs it (see [calendarsSnapshot]).
-     */
-    private val generation = AtomicLong(0L)
-
     init {
-        dataSource.registerChangeListener {
+        dataSource.registerChangeListener { ticks.tryEmit(Unit) }
-            generation.incrementAndGet()
-            ticks.tryEmit(Unit)
-        }
     }
 
-    /**
-     * Re-query signal for everything filtered by visibility: the provider's own
-     * notifications, plus every change to the pending switch-off set.
-     */
-    private fun visibilityTicks(): Flow<Unit> = merge(
-        ticks.onStart { emit(Unit) },
-        // drop(1): the current value is already covered by the tick above.
-        prefs.pendingDisabledCalendarIds.drop(1).map {},
-    )
-
-    // A switch-off not yet written to the provider is folded into the flag
-    // itself, so every consumer reads one visibility (#75). The reconciler goes
-    // to the data source directly — it needs the provider's own answer.
     override fun calendars(): Flow<List<CalendarSource>> =
-        visibilityTicks().reQuery {
+        ticks
-            val calendars = calendarsSnapshot()
+            .onStart { emit(Unit) }
-            val pendingDisabled = prefs.pendingDisabledCalendarIds.first()
+            .reQuery { dataSource.calendars() }
-            if (pendingDisabled.isEmpty()) calendars
-            else calendars.map {
-                if (it.id in pendingDisabled) it.copy(isVisibleInSystem = false) else it
-            }
-        }
-            .distinctUntilChanged()
             .flowOn(io)
 
-    // Instances are filtered by the system's VISIBLE flag ∪ the switch-offs
+    // Instances are filtered by the app-side hidden ∪ disabled calendar sets
-    // still waiting to be written to it ∪ the app-side hidden set from the
+    // (M3): an event is dropped whenever the user has hidden *or* disabled its
-    // filter sheet. [calendars] stays unfiltered so those screens can list and
+    // calendar. Re-runs when the provider ticks *or* either set changes —
-    // re-enable invisible calendars.
+    // toggling a calendar in the filter sheet or the calendar manager updates
+    // every view immediately. [calendars] stays unfiltered so those screens can
+    // list and re-enable hidden/disabled calendars.
     override fun instances(range: ClosedRange<Instant>): Flow<List<EventInstance>> =
         combine(
-            visibilityTicks().reQuery {
+            ticks
-                // All three reads in one pass, so a list of instances is never
+                .onStart { emit(Unit) }
-                // filtered against a visibility snapshot from another tick.
+                .reQuery {
-                QueriedInstances(
+                    dataSource.instances(
-                    instances = dataSource.instances(
                         beginMillis = range.start.toEpochMillis(),
                         endMillis = range.endInclusive.toEpochMillis(),
-                    ),
-                    switchedOffCalendarIds = invisibleCalendarIds() +
-                        prefs.pendingDisabledCalendarIds.first(),
                     )
                 },
             prefs.hiddenCalendarIds,
-        ) { queried, hidden ->
+            prefs.disabledCalendarIds,
-            val excluded = hidden + queried.switchedOffCalendarIds
+        ) { instances, hidden, disabled ->
-            if (excluded.isEmpty()) queried.instances
+            val excluded = hidden + disabled
-            else queried.instances.filterNot { it.calendarId in excluded }
+            if (excluded.isEmpty()) instances
+            else instances.filterNot { it.calendarId in excluded }
         }
-            // Any DataStore edit re-emits the hidden set even when unchanged;
+            // hidden and disabled both derive from one DataStore, so toggling
-            // collapse those so views don't re-render for them.
+            // either makes both re-emit and combine briefly surfaces the same
+            // list twice — collapse the duplicate so views don't re-render for it.
             .distinctUntilChanged()
             .flowOn(io)
 
-    /** One instances query plus the visibility it must be filtered against. */
-    private data class QueriedInstances(
-        val instances: List<EventInstance>,
-        val switchedOffCalendarIds: Set<Long>,
-    )
-
-    /** Calendars switched off at system level — hidden, and never reminded about. */
-    private suspend fun invisibleCalendarIds(): Set<Long> = calendarsSnapshot()
-        .filterNot { it.isVisibleInSystem }
-        .mapTo(mutableSetOf()) { it.id }
-
-    private val calendarsLock = Mutex()
-    private var cachedGeneration = -1L
-    private var cachedPending: Set<Long>? = null
-    private var cachedCalendars: List<CalendarSource> = emptyList()
-
-    /**
-     * The calendar list for the current tick, queried once and shared, so every
-     * open view doesn't pay for its own `Calendars` query and all of them see
-     * one snapshot.
-     *
-     * An empty result is never cached — that is what a read without the calendar
-     * permission returns, and the grant itself doesn't notify the provider. The
-     * pending switch-off set keys the cache alongside the tick, because an id
-     * leaves it before the invalidating observer is dispatched.
-     */
-    private suspend fun calendarsSnapshot(): List<CalendarSource> = calendarsLock.withLock {
-        val current = generation.get()
-        val pending = prefs.pendingDisabledCalendarIds.first()
-        if (current != cachedGeneration || pending != cachedPending || cachedCalendars.isEmpty()) {
-            cachedCalendars = dataSource.calendars()
-            cachedGeneration = current
-            cachedPending = pending
-        }
-        cachedCalendars
-    }
-
     override suspend fun eventDetail(eventId: Long): EventDetail = withContext(io) {
-        dataSource.eventDetail(eventId, allDayReminderTimeMinutes())
+        dataSource.eventDetail(eventId) ?: throw NoSuchEventException(eventId)
-            ?: throw NoSuchEventException(eventId)
     }
 
     override suspend fun searchEvents(query: String): List<EventInstance> = withContext(io) {
         if (query.isBlank()) return@withContext emptyList()
-        val excluded = prefs.hiddenCalendarIds.first() +
+        val excluded = prefs.hiddenCalendarIds.first() + prefs.disabledCalendarIds.first()
-            prefs.pendingDisabledCalendarIds.first() +
-            invisibleCalendarIds()
         dataSource.searchEvents(query)
             .let { if (excluded.isEmpty()) it else it.filterNot { e -> e.calendarId in excluded } }
     }
@@ -192,22 +118,6 @@ class CalendarRepositoryImpl @Inject constructor(
     override suspend fun deleteCalendar(id: Long) =
         withContext(io) { dataSource.deleteCalendar(id) }
 
-    override suspend fun setCalendarsVisible(ids: Collection<Long>, visible: Boolean) =
-        withContext(io) {
-            if (dataSource.canWriteCalendars()) {
-                ids.forEach { dataSource.setCalendarVisible(it, visible) }
-                // Nothing of ours is left waiting for the provider once the
-                // write lands (and switching one back on retires its entry).
-                prefs.removePendingDisabledCalendarIds(ids)
-            } else if (visible) {
-                prefs.removePendingDisabledCalendarIds(ids)
-            } else {
-                // Read-only permission: the switch still works, app-side, and
-                // the reconciler flushes it if WRITE_CALENDAR ever arrives.
-                prefs.addPendingDisabledCalendarIds(ids)
-            }
-        }
-
     override suspend fun exportEvents(calendarIds: Set<Long>?) =
         withContext(io) { dataSource.exportableEvents(calendarIds) }
 

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarVisibilityReconciler.kt

@@ -1,113 +0,0 @@
-package de.jeanlucmakiola.calendula.data.calendar
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.util.Log
-import androidx.core.content.ContextCompat
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import de.jeanlucmakiola.calendula.data.di.IoDispatcher
-import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
-import de.jeanlucmakiola.calendula.domain.calendarVisibilityPlan
-import de.jeanlucmakiola.calendula.domain.hasSystemHiddenCalendars
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.cancellation.CancellationException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Keeps [CalendarPrefs.pendingDisabledCalendarIds] and the system's
- * `Calendars.VISIBLE` in step (#75): the fold-in of the retired app-local
- * visibility model, and the standing drain for switch-offs made without
- * `WRITE_CALENDAR`.
- *
- * Runs on every launch and on every calendar-permission grant; a no-op once the
- * pending set is empty and the notice is settled. Only ever hides (see
- * [calendarVisibilityPlan]); on an upgraded install the first run that sees a
- * system-hidden calendar arms the one-time explanatory notice.
- */
-@Singleton
-class CalendarVisibilityReconciler @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val dataSource: CalendarDataSource,
-    private val prefs: CalendarPrefs,
-    @IoDispatcher private val io: CoroutineDispatcher,
-) {
-
-    suspend fun run() = withContext(io) {
-        // The DataStore reads sit inside the guard too: this runs in a bare
-        // application-scope coroutine, so an IOException from a damaged
-        // preferences file would take the process down on every launch.
-        try {
-            // Settled ahead of the permission gate, so an update installed
-            // before the first grant can't later look like an upgrade.
-            if (!isUpgradeInstall()) settleNoticeOnce(pending = false)
-            if (!hasPermission(Manifest.permission.READ_CALENDAR)) return@withContext
-            val pending = prefs.pendingDisabledCalendarIds.first()
-            val noticeSettled = prefs.visibilityNoticePending.first() != null
-            if (pending.isEmpty() && noticeSettled) return@withContext
-            val calendars = dataSource.calendars()
-            // Empty means "couldn't read" (null cursor), not "no calendars".
-            // Both decisions below are one-way, so leave them to the next run.
-            if (calendars.isEmpty()) return@withContext
-            settleNoticeOnce(hasSystemHiddenCalendars(calendars, pending))
-            if (pending.isEmpty() || !hasPermission(Manifest.permission.WRITE_CALENDAR)) {
-                return@withContext
-            }
-            val plan = calendarVisibilityPlan(calendars, pending)
-            prefs.removePendingDisabledCalendarIds(plan.settled)
-            // One calendar per write: the provider skips its reminder-alarm
-            // reschedule for anything but a single-id update (see
-            // [CalendarDataSource.setCalendarVisible]).
-            for (id in plan.hide) {
-                dataSource.setCalendarVisible(id, false)
-                prefs.removePendingDisabledCalendarIds(setOf(id))
-            }
-        } catch (e: CancellationException) {
-            throw e
-        } catch (e: Exception) {
-            Log.w(TAG, "Calendar visibility reconcile failed; will retry", e)
-        }
-    }
-
-    /**
-     * Settle the one-time notice: [pending] arms it, false retires it unshown.
-     * Answered once and stored either way, so it can't resurface later.
-     */
-    private suspend fun settleNoticeOnce(pending: Boolean) {
-        if (prefs.visibilityNoticePending.first() != null) return
-        prefs.setVisibilityNoticePending(pending)
-    }
-
-    /**
-     * Whether this install has ever run an earlier version. The notice explains
-     * a behaviour change, so a first install has nothing to announce.
-     */
-    private fun isUpgradeInstall(): Boolean = try {
-        @Suppress("DEPRECATION")
-        val info = context.packageManager.getPackageInfo(context.packageName, 0)
-        info.lastUpdateTime > info.firstInstallTime
-    } catch (e: PackageManager.NameNotFoundException) {
-        Log.w(TAG, "Own package info unavailable; treating as a fresh install", e)
-        false
-    }
-
-    private fun hasPermission(permission: String): Boolean =
-        ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
-
-    /** Lets non-injectable entry points (the Application) reach the reconciler. */
-    @EntryPoint
-    @InstallIn(SingletonComponent::class)
-    interface Deps {
-        fun calendarVisibilityReconciler(): CalendarVisibilityReconciler
-    }
-
-    private companion object {
-        const val TAG = "CalendarVisibility"
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/EventDetailMapper.kt

@@ -24,7 +24,6 @@ private const val TAG = "EventDetailMapper"
 internal fun ColumnReader.toEventDetailCore(
     attendees: List<Attendee>,
     reminders: List<Reminder>,
-    allDayReminderTimeMinutes: Int,
 ): EventDetail? {
     // DTSTART is epoch millis in UTC, so a series anchored before 1970 (common
     // for yearly birthdays/anniversaries synced over CalDAV) is legitimately
@@ -90,13 +89,7 @@ internal fun ColumnReader.toEventDetailCore(
     val displayReminders = if (isAllDay) {
         val startDate = Instant.ofEpochMilli(begin).atZone(ZoneOffset.UTC).toLocalDate()
         val zone = ZoneId.systemDefault()
-        reminders.map {
+        reminders.map { it.copy(minutes = fromProviderAllDayMinutes(it.minutes, startDate, zone)) }
-            it.copy(
-                minutes = fromProviderAllDayMinutes(
-                    it.minutes, startDate, zone, allDayReminderTimeMinutes,
-                ),
-            )
-        }
     } else {
         reminders
     }
@@ -125,7 +118,6 @@ internal fun ColumnReader.toEventDetailCore(
         selfStatus = mapAttendeeStatus(getInt(EventDetailProjection.IDX_SELF_ATTENDEE_STATUS)),
         eventColor = eventColor,
         eventColorKey = eventColorKey,
-        isException = !isNull(EventDetailProjection.IDX_ORIGINAL_ID),
     )
 }
 

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/EventWriteMapper.kt

@@ -6,11 +6,9 @@ import de.jeanlucmakiola.calendula.domain.Availability
 import de.jeanlucmakiola.calendula.domain.EventForm
 import kotlinx.datetime.toJavaLocalDate
 import kotlinx.datetime.toJavaLocalDateTime
-import java.time.Duration
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZoneOffset
-import java.time.LocalDateTime as JavaLocalDateTime
 
 /** Provider-ready DTSTART / DTEND / EVENT_TIMEZONE for an event write. */
 internal data class EventWriteTimes(
@@ -22,11 +20,7 @@ internal data class EventWriteTimes(
 /**
  * All-day events live at UTC midnights with an exclusive DTEND (the
  * CalendarContract convention — a one-day event ends at the next midnight);
- * timed events resolve their wall-clock values in the form's own
+ * timed events resolve their wall-clock values in [zone].
- * [EventForm.timezone], falling back to [zone] (the device) when it doesn't pin
- * one. Passing the device zone is therefore still correct for an unpinned form —
- * but it no longer overrides a pinned event's zone, which is what used to
- * silently re-anchor a foreign-zone event to the device on any time edit.
  */
 internal fun EventForm.toWriteTimes(zone: ZoneId): EventWriteTimes = if (isAllDay) {
     EventWriteTimes(
@@ -37,38 +31,13 @@ internal fun EventForm.toWriteTimes(zone: ZoneId): EventWriteTimes = if (isAllDa
         timezone = "UTC",
     )
 } else {
-    val writeZone = writeZone(zone)
     EventWriteTimes(
-        dtStartMillis = start.toJavaLocalDateTime().atZone(writeZone).toInstant().toEpochMilli(),
+        dtStartMillis = start.toJavaLocalDateTime().atZone(zone).toInstant().toEpochMilli(),
-        dtEndMillis = end.toJavaLocalDateTime().atZone(writeZone).toInstant().toEpochMilli(),
+        dtEndMillis = end.toJavaLocalDateTime().atZone(zone).toInstant().toEpochMilli(),
-        timezone = writeZone.id,
+        timezone = zone.id,
     )
 }
 
-/**
- * The zone this form's DTSTART is expressed in: UTC for an all-day event (the
- * provider's date anchor), otherwise the form's own pinned zone, falling back to
- * [deviceZone] when it doesn't pin one or pins something the tz database can't
- * parse.
- */
-private fun EventForm.writeZone(deviceZone: ZoneId): ZoneId = if (isAllDay) {
-    ZoneOffset.UTC
-} else {
-    timezone?.let { runCatching { ZoneId.of(it) }.getOrNull() } ?: deviceZone
-}
-
-/**
- * The form's start as a bare wall-clock value — what the user sees on the form,
- * stripped of any zone. All-day events use their date's midnight rather than
- * [EventForm.start]'s placeholder time-of-day, which exists only so switching the
- * event back to timed has something to show.
- */
-private fun EventForm.anchorLocal(): JavaLocalDateTime = if (isAllDay) {
-    start.date.toJavaLocalDate().atStartOfDay()
-} else {
-    start.toJavaLocalDateTime()
-}
-
 /**
  * RFC 2445 duration for a recurring event's row (the provider requires
  * DURATION instead of DTEND when an RRULE is set): whole days for all-day
@@ -135,12 +104,10 @@ internal fun buildEventInsertValues(
  * Time fields travel together (the provider validates them as a unit):
  * - unchanged times, all-day flag and rrule → no time columns at all;
  * - non-recurring result → DTSTART/DTEND, DURATION and RRULE cleared;
- * - recurring result → the *series* DTSTART moves by the same **wall-clock**
+ * - recurring result → the *series* DTSTART moves by the same delta the user
- *   shift the user applied to the displayed occurrence and is re-resolved in the
+ *   applied to the displayed occurrence ([seriesDtStartMillis] is the row's
- *   event's zone ([seriesDtStartMillis] is the row's current DTSTART), DURATION
+ *   current DTSTART), DURATION replaces DTEND, RRULE is written. This keeps
- *   replaces DTEND, RRULE is written. This keeps past occurrences intact when
+ *   past occurrences intact when someone edits a later occurrence's time.
- *   someone edits a later occurrence's time, and keeps the anchor's time-of-day
- *   stable across a DST boundary or a zone change between the two.
  */
 internal fun buildEventUpdateValues(
     original: EventForm,
@@ -167,14 +134,10 @@ internal fun buildEventUpdateValues(
         putAll(eventColorColumns(updated.colorKey, updated.color))
     }
 
-    // A zone change counts as a time change even when the wall-clock is
-    // untouched: the same 09:00 in another zone is a different instant, so
-    // DTSTART has to move with it.
     val timesChanged = updated.start != original.start ||
         updated.end != original.end ||
         updated.isAllDay != original.isAllDay ||
-        updated.rrule != original.rrule ||
+        updated.rrule != original.rrule
-        updated.timezone != original.timezone
     if (!timesChanged) return@buildMap
 
     val newTimes = updated.toWriteTimes(zone)
@@ -186,23 +149,8 @@ internal fun buildEventUpdateValues(
         put(CalendarContract.Events.RRULE, null)
         put(CalendarContract.Events.DURATION, null)
     } else {
-        // Move the series anchor by the *wall-clock* shift the user applied to the
+        val startDelta = newTimes.dtStartMillis - original.toWriteTimes(zone).dtStartMillis
-        // displayed occurrence, then re-resolve it in the event's (possibly new)
+        put(CalendarContract.Events.DTSTART, seriesDtStartMillis + startDelta)
-        // zone — never by a millisecond delta. An instant delta silently bakes in
-        // the offset that happened to apply on the edited occurrence's date, which
-        // is a different offset from the series anchor's whenever a DST boundary
-        // sits between them, or whenever the zone itself changed. Working in wall
-        // clock keeps "09:00" meaning 09:00 at both ends.
-        val seriesLocal = Instant.ofEpochMilli(seriesDtStartMillis)
-            .atZone(original.writeZone(zone)).toLocalDateTime()
-        val wallClockShift = Duration.between(original.anchorLocal(), updated.anchorLocal())
-        val shifted = seriesLocal.plus(wallClockShift)
-        // An all-day series anchor must sit on a UTC midnight. A pure day move
-        // already lands there (both ends are midnights), but *switching* a
-        // recurring event to all-day shifts by a time-of-day too, so snap.
-        val newSeriesLocal = if (updated.isAllDay) shifted.toLocalDate().atStartOfDay() else shifted
-        val newSeriesStart = newSeriesLocal.atZone(updated.writeZone(zone))
-        put(CalendarContract.Events.DTSTART, newSeriesStart.toInstant().toEpochMilli())
         put(CalendarContract.Events.DTEND, null)
         put(CalendarContract.Events.RRULE, updated.rrule)
         put(CalendarContract.Events.DURATION, newTimes.toRfc2445Duration(updated.isAllDay))

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/Projections.kt

@@ -19,7 +19,6 @@ internal object CalendarProjection {
         // uses to recognise its own managed calendars, independent of any
         // stored preference id (which a backup restore / data wipe can lose).
         MANAGED_MARKER_COLUMN,
-        CalendarContract.Calendars.SYNC_EVENTS,
     )
 
     const val DESCRIPTION_COLUMN: String = CalendarContract.Calendars.CAL_SYNC1
@@ -37,7 +36,6 @@ internal object CalendarProjection {
     const val IDX_ACCESS_LEVEL = 6
     const val IDX_DESCRIPTION = 7
     const val IDX_MANAGED_MARKER = 8
-    const val IDX_SYNC_EVENTS = 9
 }
 
 internal object InstanceProjection {
@@ -89,9 +87,6 @@ internal object EventDetailProjection {
         // Recurring rows carry DURATION instead of DTEND; the detail screen
         // needs it to render a series opened without a named occurrence.
         CalendarContract.Events.DURATION,
-        // Non-null on a modified-occurrence exception row; "no RRULE" alone
-        // can't tell an exception from a master (#68).
-        CalendarContract.Events.ORIGINAL_ID,
     )
 
     const val IDX_EVENT_ID = 0
@@ -113,7 +108,6 @@ internal object EventDetailProjection {
     const val IDX_SELF_ATTENDEE_STATUS = 16
     const val IDX_EVENT_COLOR_KEY = 17
     const val IDX_DURATION = 18
-    const val IDX_ORIGINAL_ID = 19
 }
 
 /**

app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/SearchMapper.kt

@@ -40,7 +40,5 @@ internal fun ColumnReader.toSearchResult(): EventInstance? {
         isAllDay = getInt(SearchProjection.IDX_ALL_DAY) != 0,
         color = color,
         location = getString(SearchProjection.IDX_LOCATION),
-        isRecurring = !getString(SearchProjection.IDX_RRULE).isNullOrEmpty() ||
-            !getString(SearchProjection.IDX_RDATE).isNullOrEmpty(),
     )
 }

app/src/main/java/de/jeanlucmakiola/calendula/data/di/DataModule.kt

@@ -18,8 +18,8 @@ import de.jeanlucmakiola.calendula.data.contacts.AndroidContactSpecialDatesDataS
 import de.jeanlucmakiola.calendula.data.contacts.AndroidSpecialDatesCalendarSpec
 import de.jeanlucmakiola.calendula.data.contacts.ContactSpecialDatesDataSource
 import de.jeanlucmakiola.calendula.data.contacts.SpecialDatesCalendarSpec
-import de.jeanlucmakiola.calendula.data.reminders.ProviderReminderInstanceSource
+import de.jeanlucmakiola.calendula.data.reminders.AndroidReminderAlertStore
-import de.jeanlucmakiola.calendula.data.reminders.ReminderInstanceSource
+import de.jeanlucmakiola.calendula.data.reminders.ReminderAlertStore
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Singleton
@@ -46,9 +46,9 @@ abstract class DataBindModule {
 
     @Binds
     @Singleton
-    abstract fun bindReminderInstanceSource(
+    abstract fun bindReminderAlertStore(
-        impl: ProviderReminderInstanceSource,
+        impl: AndroidReminderAlertStore,
-    ): ReminderInstanceSource
+    ): ReminderAlertStore
 
     @Binds
     @Singleton

app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt

@@ -1,25 +1,18 @@
 package de.jeanlucmakiola.calendula.data.prefs
 
 import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.MutablePreferences
 import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * App-side calendar preferences. [hiddenCalendarIds] is the drawer's filter
+ * App-side preference for "calendars the user has hidden in this app",
- * sheet — a purely in-app declutter that deliberately does *not* suppress
+ * separate from the system's per-calendar VISIBLE flag.
- * reminders. Switching a calendar off entirely is the system's
- * `Calendars.VISIBLE` flag, written straight to the provider (#75);
- * [pendingDisabledCalendarIds] only holds those switch-offs the app has not been
- * allowed to write yet.
  *
  * Persisted as a comma-separated string of Long ids; non-numeric tokens are
  * silently dropped (defensive — see CalendarPrefsTest).
@@ -29,56 +22,46 @@ class CalendarPrefs @Inject constructor(
     private val store: DataStore<Preferences>,
 ) {
 
-    // Both id sets are deduped: the store is shared with SettingsPrefs, so any
+    val hiddenCalendarIds: Flow<Set<Long>> = store.data.map { prefs ->
-    // unrelated write would otherwise re-emit an identical set.
+        prefs[HIDDEN_IDS_KEY].orEmpty()
-    val hiddenCalendarIds: Flow<Set<Long>> = store.data
+            .split(',')
-        .map { prefs -> prefs[HIDDEN_IDS_KEY].parseIds() }
+            .mapNotNull { it.trim().toLongOrNull() }
-        .distinctUntilChanged()
+            .toSet()
+    }
 
     suspend fun setHiddenCalendarIds(ids: Set<Long>) {
-        store.edit { prefs -> prefs.writeIds(HIDDEN_IDS_KEY, ids) }
-    }
-
-    /**
-     * Switch-offs the provider does not know about yet, because writing
-     * `Calendars.VISIBLE` needs `WRITE_CALENDAR` (#75). Also inherits the
-     * retired app-local model's set, from the same key.
-     *
-     * Honoured as a display and reminder filter while non-empty, but not a
-     * second visibility model: `CalendarVisibilityReconciler` drains it entry by
-     * entry as soon as the app may write, and nothing adds to it while it may.
-     */
-    val pendingDisabledCalendarIds: Flow<Set<Long>> = store.data
-        .map { prefs -> prefs[DISABLED_IDS_KEY].parseIds() }
-        .distinctUntilChanged()
-
-    suspend fun addPendingDisabledCalendarIds(ids: Collection<Long>) =
-        editPendingDisabled { it + ids }
-
-    /**
-     * Drop [ids] from the pending set, one at a time as the reconciler flushes
-     * them, so a run that fails part-way never re-applies what already landed.
-     */
-    suspend fun removePendingDisabledCalendarIds(ids: Collection<Long>) =
-        editPendingDisabled { it - ids.toSet() }
-
-    private suspend fun editPendingDisabled(transform: (Set<Long>) -> Set<Long>) {
         store.edit { prefs ->
-            prefs.writeIds(DISABLED_IDS_KEY, transform(prefs[DISABLED_IDS_KEY].parseIds()))
+            if (ids.isEmpty()) {
+                prefs.remove(HIDDEN_IDS_KEY)
+            } else {
+                prefs[HIDDEN_IDS_KEY] = ids.sorted().joinToString(",")
+            }
         }
     }
 
     /**
-     * Whether the one-time "visibility follows this device" notice is still
+     * App-side preference for "calendars the user has disabled in this app" — a
-     * owed. Null until the reconciler has evaluated it (which needs the calendar
+     * heavier level than [hiddenCalendarIds]. A disabled calendar is removed from
-     * permission), false once it has been shown or was never needed.
+     * every surface (drawer filter, event-form picker, import picker) and its
+     * events never appear; it stays listed only in Settings → Calendars so it can
+     * be re-enabled. Stored exactly like the hidden set; never touches the
+     * system's VISIBLE/SYNC_EVENTS flags, so other calendar apps are unaffected.
      */
-    val visibilityNoticePending: Flow<Boolean?> = store.data.map { prefs ->
+    val disabledCalendarIds: Flow<Set<Long>> = store.data.map { prefs ->
-        prefs[VISIBILITY_NOTICE_KEY]
+        prefs[DISABLED_IDS_KEY].orEmpty()
+            .split(',')
+            .mapNotNull { it.trim().toLongOrNull() }
+            .toSet()
     }
 
-    suspend fun setVisibilityNoticePending(pending: Boolean) {
+    suspend fun setDisabledCalendarIds(ids: Set<Long>) {
-        store.edit { prefs -> prefs[VISIBILITY_NOTICE_KEY] = pending }
+        store.edit { prefs ->
+            if (ids.isEmpty()) {
+                prefs.remove(DISABLED_IDS_KEY)
+            } else {
+                prefs[DISABLED_IDS_KEY] = ids.sorted().joinToString(",")
+            }
+        }
     }
 
     /**
@@ -96,16 +79,6 @@ class CalendarPrefs @Inject constructor(
     companion object {
         internal val HIDDEN_IDS_KEY = stringPreferencesKey("hidden_calendar_ids")
         internal val DISABLED_IDS_KEY = stringPreferencesKey("disabled_calendar_ids")
-        internal val VISIBILITY_NOTICE_KEY = booleanPreferencesKey("visibility_notice_pending")
         internal val LAST_USED_CALENDAR_KEY = longPreferencesKey("last_used_calendar_id")
     }
 }
-
-private fun String?.parseIds(): Set<Long> = orEmpty()
-    .split(',')
-    .mapNotNull { it.trim().toLongOrNull() }
-    .toSet()
-
-private fun MutablePreferences.writeIds(key: Preferences.Key<String>, ids: Set<Long>) {
-    if (ids.isEmpty()) remove(key) else set(key, ids.sorted().joinToString(","))
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/ReminderStatePrefs.kt

@@ -1,36 +0,0 @@
-package de.jeanlucmakiola.calendula.data.prefs
-
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.longPreferencesKey
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * How far reminder delivery has got — the one number replacing the provider's
- * `CalendarAlerts.STATE` (#75). A scan posts the reminders falling after this
- * watermark and up to now, then moves it to now, so a scan running twice cannot
- * post twice while a late one still catches up.
- *
- * Unset means "never scanned", not zero: the first scan after an install would
- * otherwise treat every reminder since the epoch as overdue.
- */
-@Singleton
-class ReminderStatePrefs @Inject constructor(
-    private val store: DataStore<Preferences>,
-) {
-
-    /** The watermark, or `null` before the first scan has ever run. */
-    suspend fun lastScanMillis(): Long? = store.data.map { it[LAST_SCAN_KEY] }.first()
-
-    suspend fun setLastScanMillis(millis: Long) {
-        store.edit { prefs -> prefs[LAST_SCAN_KEY] = millis }
-    }
-
-    private companion object {
-        val LAST_SCAN_KEY = longPreferencesKey("reminder_last_scan_millis")
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt

@@ -21,19 +21,9 @@ import de.jeanlucmakiola.calendula.ui.agenda.storageValue
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
 import de.jeanlucmakiola.calendula.ui.common.IMPLEMENTED_VIEWS
 import de.jeanlucmakiola.calendula.ui.common.QuickSwitchConfig
-import de.jeanlucmakiola.calendula.ui.common.TimelineScale
-import de.jeanlucmakiola.calendula.ui.common.parseTimelineScale
-import de.jeanlucmakiola.calendula.ui.common.storageValue
-import de.jeanlucmakiola.calendula.ui.month.MonthViewStyle
 import de.jeanlucmakiola.calendula.ui.theme.FONT_SYSTEM_TOKEN
-import de.jeanlucmakiola.calendula.widget.WidgetSize
-import java.time.ZoneId
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.datetime.DayOfWeek
 import java.time.temporal.WeekFields
 import java.util.Locale
@@ -91,24 +81,6 @@ fun WeekStartPref.resolveFirstDay(locale: Locale): DayOfWeek = when (this) {
     WeekStartPref.Auto -> DayOfWeek(WeekFields.of(locale).firstDayOfWeek.value)
 }
 
-/**
- * The resolved first day of the week as a hot [StateFlow] — the one shape every
- * screen that orders or lays out weekdays should use (the month grid, the agenda
- * "this week" range, the recurrence weekday toggles). Sharing it keeps the
- * initial-frame value identical everywhere; hand-rolled copies had drifted onto
- * different `initialValue`s, so two surfaces could disagree for a frame.
- */
-fun SettingsPrefs.firstDayOfWeek(scope: CoroutineScope): StateFlow<DayOfWeek> =
-    weekStart
-        .map { it.resolveFirstDay(Locale.getDefault()) }
-        .stateIn(
-            scope = scope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            // Seed with the locale convention rather than a hardcoded weekday, so
-            // the first frame is already right for everyone still on Auto.
-            initialValue = WeekStartPref.Auto.resolveFirstDay(Locale.getDefault()),
-        )
-
 /**
  * Display settings (M4) persisted app-side: theme override, Material You
  * dynamic colour, and week start. Language is handled separately through
@@ -261,46 +233,6 @@ class SettingsPrefs @Inject constructor(
         store.edit { it[SHOW_WEEK_NUMBERS_KEY] = enabled }
     }
 
-    /**
-     * How the Month view lays itself out (#38, #53). Defaults to [MonthViewStyle.Paged]
-     * — the historical behaviour, so existing installs see no change until they opt in.
-     */
-    val monthViewStyle: Flow<MonthViewStyle> = store.data.map { prefs ->
-        prefs[MONTH_VIEW_STYLE_KEY].toEnum(MonthViewStyle.Paged)
-    }
-
-    suspend fun setMonthViewStyle(style: MonthViewStyle) {
-        store.edit { it[MONTH_VIEW_STYLE_KEY] = style.name }
-    }
-
-    /**
-     * How tall an hour is drawn in the week and day timelines (#56). Defaults to
-     * [TimelineScale.Regular] — the historical 56dp scale. Holds either a preset
-     * or the height a pinch on the timeline settled at.
-     */
-    val timelineScale: Flow<TimelineScale> = store.data.map { prefs ->
-        parseTimelineScale(prefs[TIMELINE_SCALE_KEY])
-    }
-
-    suspend fun setTimelineScale(scale: TimelineScale) {
-        store.edit { it[TIMELINE_SCALE_KEY] = scale.storageValue() }
-    }
-
-    /**
-     * Where the jump-to-today control lives (issue #60). Default OFF — the
-     * historical layout, where it's an extended FAB that fades in above the "+"
-     * only while the view is off today. Turning it ON moves it to a persistent
-     * icon button in each calendar view's top bar (always shown, on today or
-     * not) and drops the FAB pill.
-     */
-    val todayButtonInToolbar: Flow<Boolean> = store.data.map { prefs ->
-        prefs[TODAY_BUTTON_IN_TOOLBAR_KEY] ?: false
-    }
-
-    suspend fun setTodayButtonInToolbar(enabled: Boolean) {
-        store.edit { it[TODAY_BUTTON_IN_TOOLBAR_KEY] = enabled }
-    }
-
     /**
      * How far ahead the in-app Agenda screen shows events (v2.11). Defaults to
      * [AgendaRange.Month] — a month of upcoming events. Independent of the
@@ -323,23 +255,6 @@ class SettingsPrefs @Inject constructor(
         store.edit { it[AGENDA_WIDGET_RANGE_KEY] = range.storageValue() }
     }
 
-    /**
-     * The size step the agenda widget draws its text at (#51). Defaults to
-     * [WidgetSize.SMALL], which reproduces its original metrics, so an existing
-     * widget is unchanged until its owner turns the size up.
-     *
-     * This replaced deriving a size tier from the widget's measured size, which
-     * the launcher does not report reliably. The month widget takes no size
-     * setting — it divides the width it is given by seven (#103).
-     */
-    val widgetSize: Flow<WidgetSize> = store.data.map { prefs ->
-        prefs[WIDGET_SIZE_KEY].toEnum(WidgetSize.SMALL)
-    }
-
-    suspend fun setWidgetSize(size: WidgetSize) {
-        store.edit { it[WIDGET_SIZE_KEY] = size.name }
-    }
-
     /**
      * Whether the agenda shows its top range bar — the "showing …" header and
      * the session range switcher (v2.11). Default ON.
@@ -439,26 +354,6 @@ class SettingsPrefs @Inject constructor(
         }
     }
 
-    /**
-     * Zones the user picked recently, most recent first — the timezone picker's
-     * default list, since scrolling ~600 zones to re-find the two you actually
-     * use is the whole problem. Stored comma-joined (IANA ids never contain a
-     * comma); unparseable ids are dropped on read, so a zone the tz database
-     * later retires can't wedge the list.
-     */
-    val recentTimeZones: Flow<List<String>> = store.data.map { prefs ->
-        parseRecentTimeZones(prefs[RECENT_TIMEZONES_KEY])
-    }
-
-    suspend fun addRecentTimeZone(zoneId: String) {
-        store.edit { prefs ->
-            val updated = (listOf(zoneId) + parseRecentTimeZones(prefs[RECENT_TIMEZONES_KEY]))
-                .distinct()
-                .take(MAX_RECENT_TIME_ZONES)
-            prefs[RECENT_TIMEZONES_KEY] = updated.joinToString(",")
-        }
-    }
-
     /**
      * Whether opening the new-event form focuses the title field and raises the
      * keyboard straight away (issue #10). Default ON — a new event almost always
@@ -473,46 +368,6 @@ class SettingsPrefs @Inject constructor(
         store.edit { it[AUTOFOCUS_EVENT_TITLE_KEY] = enabled }
     }
 
-    /**
-     * How long a new **timed** event lasts, in minutes (#54). Defaults to
-     * [DEFAULT_EVENT_DURATION] — the historical fixed hour. Per-calendar
-     * overrides in [perCalendarEventDuration] take precedence; all-day events are
-     * date-anchored and ignore it. Resolve with [resolveDefaultEventDuration].
-     */
-    val defaultEventDurationMinutes: Flow<Int> = store.data.map { prefs ->
-        (prefs[DEFAULT_EVENT_DURATION_KEY] ?: DEFAULT_EVENT_DURATION)
-            .coerceIn(MIN_EVENT_DURATION, MAX_EVENT_DURATION)
-    }
-
-    suspend fun setDefaultEventDurationMinutes(minutes: Int) {
-        store.edit {
-            it[DEFAULT_EVENT_DURATION_KEY] = minutes.coerceIn(MIN_EVENT_DURATION, MAX_EVENT_DURATION)
-        }
-    }
-
-    /**
-     * Per-calendar overrides of [defaultEventDurationMinutes], keyed by calendar
-     * id: a calendar **present** in the map gives its new events that length, one
-     * **absent** inherits the global default (there is no "no duration", so this
-     * needs no `none` sentinel). Serialised as `id=minutes;id=minutes`.
-     */
-    val perCalendarEventDuration: Flow<Map<Long, Int>> = store.data.map { prefs ->
-        parseDurationOverrides(prefs[CALENDAR_EVENT_DURATION_KEY])
-    }
-
-    /** [minutes] null drops the override, so the calendar inherits the global default. */
-    suspend fun setCalendarEventDuration(calendarId: Long, minutes: Int?) {
-        store.edit { prefs ->
-            val current = parseDurationOverrides(prefs[CALENDAR_EVENT_DURATION_KEY]).toMutableMap()
-            if (minutes == null) {
-                current.remove(calendarId)
-            } else {
-                current[calendarId] = minutes.coerceIn(MIN_EVENT_DURATION, MAX_EVENT_DURATION)
-            }
-            prefs[CALENDAR_EVENT_DURATION_KEY] = current.toStoredDurations()
-        }
-    }
-
     /**
      * Whether Calendula posts reminder notifications (v1.4). Defaults to ON —
      * for users whose only calendar app this is, reminders are essential; the
@@ -795,13 +650,6 @@ class SettingsPrefs @Inject constructor(
     private fun titleTemplateKey(type: SpecialDateType) =
         stringPreferencesKey("special_dates_title_${type.name}")
 
-    private fun parseRecentTimeZones(stored: String?): List<String> =
-        stored?.split(',').orEmpty()
-            .map { it.trim() }
-            .filter { it.isNotEmpty() && runCatching { ZoneId.of(it) }.isSuccess }
-            .distinct()
-            .take(MAX_RECENT_TIME_ZONES)
-
     private fun parseFormFields(stored: String?): Set<EventFormField> = when (stored) {
         null -> DEFAULT_FORM_FIELDS
         else -> stored.split(',')
@@ -855,7 +703,6 @@ class SettingsPrefs @Inject constructor(
         internal val AGENDA_SCREEN_RANGE_KEY = stringPreferencesKey("agenda_screen_range")
         internal val AGENDA_WIDGET_RANGE_KEY = stringPreferencesKey("agenda_widget_range")
         internal val AGENDA_SHOW_RANGE_BAR_KEY = booleanPreferencesKey("agenda_show_range_bar")
-        internal val WIDGET_SIZE_KEY = stringPreferencesKey("widget_size")
         internal val AGENDA_SHOW_TODAY_KEY =
             booleanPreferencesKey("agenda_show_today")
         internal val TIME_FORMAT_KEY = stringPreferencesKey("time_format")
@@ -863,23 +710,11 @@ class SettingsPrefs @Inject constructor(
         internal val PAST_EVENT_DISPLAY_KEY = stringPreferencesKey("agenda_past_event_display")
         internal val DIM_COMPLETED_EVENTS_KEY = booleanPreferencesKey("dim_completed_events")
         internal val SHOW_WEEK_NUMBERS_KEY = booleanPreferencesKey("show_week_numbers")
-        internal val MONTH_VIEW_STYLE_KEY = stringPreferencesKey("month_view_style")
-        internal val TIMELINE_SCALE_KEY = stringPreferencesKey("timeline_scale")
-        internal val TODAY_BUTTON_IN_TOOLBAR_KEY = booleanPreferencesKey("today_button_in_toolbar")
         internal val DEFAULT_VIEW_KEY = stringPreferencesKey("default_view")
         internal val QUICK_SWITCH_VIEWS_KEY = stringPreferencesKey("quick_switch_views")
         internal val DRAWER_VIEW_ORDER_KEY = stringPreferencesKey("drawer_view_order")
         internal val FORM_FIELDS_KEY = stringPreferencesKey("event_form_default_fields")
         internal val AUTOFOCUS_EVENT_TITLE_KEY = booleanPreferencesKey("autofocus_event_title")
-        internal val DEFAULT_EVENT_DURATION_KEY = intPreferencesKey("default_event_duration_minutes")
-        internal val CALENDAR_EVENT_DURATION_KEY =
-            stringPreferencesKey("per_calendar_event_duration")
-
-        /** A new timed event's length until the user changes it: one hour. */
-        const val DEFAULT_EVENT_DURATION = 60
-        internal const val MIN_EVENT_DURATION = 1
-        /** A day — past that the form is describing a multi-day event, not a default. */
-        internal const val MAX_EVENT_DURATION = 1_440
         internal val REMINDERS_ENABLED_KEY = booleanPreferencesKey("reminders_enabled")
         internal val REMINDER_ONBOARDING_KEY = booleanPreferencesKey("reminder_onboarding_done")
         internal val ALLOW_COLOR_UNSUPPORTED_KEY =
@@ -901,10 +736,6 @@ class SettingsPrefs @Inject constructor(
             stringPreferencesKey("per_calendar_allday_reminder_override")
         internal val DEFAULT_FORM_FIELDS =
             setOf(EventFormField.Location, EventFormField.Description)
-        internal val RECENT_TIMEZONES_KEY = stringPreferencesKey("recent_time_zones")
-
-        /** Enough to cover the zones a user actually recurs to, without a wall of rows. */
-        internal const val MAX_RECENT_TIME_ZONES = 5
         internal val AUTO_BACKUP_ENABLED_KEY = booleanPreferencesKey("auto_backup_enabled")
         internal val AUTO_BACKUP_INTERVAL_KEY = longPreferencesKey("auto_backup_interval_minutes")
         internal val AUTO_BACKUP_FOLDER_KEY = stringPreferencesKey("auto_backup_folder_uri")
@@ -971,17 +802,6 @@ fun resolveDefaultReminder(
     }
 }
 
-/**
- * The length a new timed event on [calendarId] opens with: that calendar's
- * override if it has one, otherwise the [global] default. Pure so it can be
- * unit-tested.
- */
-fun resolveDefaultEventDuration(
-    global: Int,
-    overrides: Map<Long, Int>,
-    calendarId: Long?,
-): Int = calendarId?.let { overrides[it] } ?: global
-
 /** Sentinel stored for [WeekStartPref.Auto]; days store their [DayOfWeek.name]. */
 private const val WEEK_START_AUTO = "AUTO"
 
@@ -1029,27 +849,6 @@ private fun String?.toReminderList(): List<Int> = when {
 private fun List<Int>.toStoredReminders(): String =
     if (isEmpty()) NONE else normalizeReminders().joinToString(LIST_SEP) { it.toString() }
 
-/**
- * Parse the per-calendar duration map (`id=minutes` entries joined by `;`).
- * Malformed entries and out-of-range lengths are dropped, so a garbled value
- * degrades to "inherits the global default" instead of throwing.
- */
-private fun parseDurationOverrides(stored: String?): Map<Long, Int> =
-    stored?.split(ENTRY_SEP).orEmpty().mapNotNull { entry ->
-        val parts = entry.split(KEY_VALUE_SEP)
-        if (parts.size != 2) return@mapNotNull null
-        val calendarId = parts[0].trim().toLongOrNull() ?: return@mapNotNull null
-        val minutes = parts[1].trim().toIntOrNull()
-            ?.takeIf { it in SettingsPrefs.MIN_EVENT_DURATION..SettingsPrefs.MAX_EVENT_DURATION }
-            ?: return@mapNotNull null
-        calendarId to minutes
-    }.toMap()
-
-private fun Map<Long, Int>.toStoredDurations(): String =
-    entries.sortedBy { it.key }.joinToString(ENTRY_SEP) { (id, minutes) ->
-        "$id$KEY_VALUE_SEP$minutes"
-    }
-
 
 private inline fun <reified E : Enum<E>> String?.toEnum(default: E): E =
     this?.let { stored -> enumValues<E>().firstOrNull { it.name == stored } } ?: default

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/EventReminderReceiver.kt

@@ -0,0 +1,92 @@
+package de.jeanlucmakiola.calendula.data.reminders
+
+import android.Manifest
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.provider.CalendarContract
+import androidx.core.content.ContextCompat
+import dagger.hilt.android.AndroidEntryPoint
+import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
+import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * True when [this] alert belongs to a calendar the user disabled in-app, so its
+ * reminder must be suppressed (mirroring the event filtering in
+ * CalendarRepositoryImpl). Alerts whose calendar is unknown (id 0L — e.g. a
+ * pre-upgrade snooze PendingIntent minted before EXTRA_CALENDAR_ID existed) are
+ * never treated as disabled. This is the one predicate the disabled-calendar
+ * gate is built from: [postableAlerts] here and the choke point in
+ * [ReminderNotifier.post] both use it.
+ */
+internal fun ReminderAlert.isForDisabledCalendar(disabledCalendarIds: Set<Long>): Boolean =
+    calendarId != 0L && calendarId in disabledCalendarIds
+
+/**
+ * The due alerts that should actually surface as notifications: everything
+ * except alerts whose calendar the user has disabled in-app. The caller still
+ * marks the full due set fired, so suppressed alerts are not re-broadcast by the
+ * provider.
+ */
+internal fun postableAlerts(
+    due: List<ReminderAlert>,
+    disabledCalendarIds: Set<Long>,
+): List<ReminderAlert> = due.filterNot { it.isForDisabledCalendar(disabledCalendarIds) }
+
+/**
+ * Becomes the app that turns the calendar provider's reminder alarms into
+ * visible notifications (the Etar model — the provider broadcasts
+ * `EVENT_REMINDER` at reminder time but posts nothing itself).
+ *
+ * The broadcast's data URI only carries the alarm time, so it is ignored:
+ * we query every still-scheduled, due `CalendarAlerts` row ourselves, post
+ * them, and mark them fired. Posting happens before marking — a crash in
+ * between re-posts silently (same tag) rather than losing the reminder.
+ */
+@AndroidEntryPoint
+class EventReminderReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var alertStore: ReminderAlertStore
+    @Inject lateinit var notifier: ReminderNotifier
+    @Inject lateinit var settingsPrefs: SettingsPrefs
+    @Inject lateinit var calendarPrefs: CalendarPrefs
+    @Inject lateinit var suppressedStore: SuppressedReminderStore
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action != CalendarContract.ACTION_EVENT_REMINDER) return
+        val readGranted = ContextCompat.checkSelfPermission(
+            context, Manifest.permission.READ_CALENDAR,
+        ) == PackageManager.PERMISSION_GRANTED
+        if (!readGranted || !notifier.canPost()) return
+
+        val pendingResult = goAsync()
+        CoroutineScope(SupervisorJob() + Dispatchers.IO).launch {
+            try {
+                if (settingsPrefs.remindersEnabled.first()) {
+                    val now = System.currentTimeMillis()
+                    val due = alertStore.dueAlerts(now)
+                    val disabled = calendarPrefs.disabledCalendarIds.first()
+                    val postable = postableAlerts(due, disabled)
+                    // Suppress reminders for disabled calendars, but still mark
+                    // every due alert fired so the provider stops re-broadcasting
+                    // the suppressed ones. Stash those suppressed alerts so
+                    // re-enabling their calendar can recover them (they would
+                    // otherwise stay STATE_FIRED forever with no re-scan).
+                    postable.forEach { notifier.post(it) }
+                    alertStore.markFired(due.map { it.alertId }, now)
+                    suppressedStore.stash(due - postable.toSet(), now)
+                    suppressedStore.purgeExpired(now)
+                }
+            } finally {
+                pendingResult.finish()
+            }
+        }
+    }
+}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderActionReceiver.kt

@@ -3,7 +3,6 @@ package de.jeanlucmakiola.calendula.data.reminders
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import androidx.core.net.toUri
 import dagger.hilt.android.AndroidEntryPoint
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import kotlinx.coroutines.CoroutineScope
@@ -19,14 +18,12 @@ import javax.inject.Inject
  * intents (notification action buttons and our own [ReminderSnoozeScheduler]
  * alarm), so the receiver is not exported.
  *
- * - **Dismiss** just cancels the notification — the scan's watermark has moved
+ * - **Dismiss** just cancels the notification — the `CalendarAlerts` row is
- *   past this reminder, so nothing re-posts it.
+ *   already fired, so nothing re-posts it.
  * - **Snooze** cancels the notification and schedules an exact alarm to re-show
  *   it after the user's snooze delay.
  * - **Show** (the alarm) re-posts the same notification, so the user can snooze
- *   or dismiss it again — unless the calendar was switched off during the
+ *   or dismiss it again.
- *   snooze, which [ReminderNotifier.post] catches — this alarm is its own
- *   trigger, outside the ordinary scan.
  */
 @AndroidEntryPoint
 class ReminderActionReceiver : BroadcastReceiver() {
@@ -76,14 +73,7 @@ class ReminderActionReceiver : BroadcastReceiver() {
         const val ACTION_DISMISS = "de.jeanlucmakiola.calendula.reminders.DISMISS"
         const val ACTION_SHOW = "de.jeanlucmakiola.calendula.reminders.SHOW"
 
-        /**
+        private const val EXTRA_ALERT_ID = "alert_id"
-         * Not handled here — the notification body opens the detail screen
-         * directly. It only claims a slot in [requestCode] so that intent stays
-         * distinct from the three this receiver does handle.
-         */
-        const val ACTION_OPEN = "de.jeanlucmakiola.calendula.reminders.OPEN"
-
-        private const val EXTRA_ALERT_KEY = "alert_key"
         private const val EXTRA_EVENT_ID = "event_id"
         private const val EXTRA_CALENDAR_ID = "calendar_id"
         private const val EXTRA_BEGIN = "begin"
@@ -92,16 +82,11 @@ class ReminderActionReceiver : BroadcastReceiver() {
         private const val EXTRA_LOCATION = "location"
         private const val EXTRA_ALL_DAY = "all_day"
 
-        /**
+        /** An explicit intent to this receiver carrying [alert] as extras. */
-         * An explicit intent to this receiver carrying [alert] as extras. The
-         * data URI duplicates no information but is what keeps two reminders'
-         * `PendingIntent`s apart — `filterEquals` never compares extras.
-         */
         fun intent(context: Context, action: String, alert: ReminderAlert): Intent =
             Intent(context, ReminderActionReceiver::class.java).apply {
                 this.action = action
-                data = "calendula://reminder/${alert.key}".toUri()
+                putExtra(EXTRA_ALERT_ID, alert.alertId)
-                putExtra(EXTRA_ALERT_KEY, alert.key)
                 putExtra(EXTRA_EVENT_ID, alert.eventId)
                 putExtra(EXTRA_CALENDAR_ID, alert.calendarId)
                 putExtra(EXTRA_BEGIN, alert.beginMillis)
@@ -112,25 +97,23 @@ class ReminderActionReceiver : BroadcastReceiver() {
             }
 
         /**
-         * A stable request code per (alert, action), so one notification's
+         * A stable request code per (alert, action) so the three PendingIntents
-         * PendingIntents stay distinct. The shift keeps the action slot intact;
+         * of one notification stay distinct and don't clobber each other.
-         * the top bits it drops are separated by [intent]'s per-reminder URI.
          */
         fun requestCode(alert: ReminderAlert, action: String): Int {
             val actionOffset = when (action) {
                 ACTION_SNOOZE -> 1
                 ACTION_DISMISS -> 2
                 ACTION_SHOW -> 3
-                ACTION_OPEN -> 4
                 else -> 0
             }
-            return (alert.key.toInt() shl 3) + actionOffset
+            return alert.alertId.toInt() * 8 + actionOffset
         }
 
         private fun alertFrom(intent: Intent): ReminderAlert? {
-            if (!intent.hasExtra(EXTRA_ALERT_KEY)) return null
+            if (!intent.hasExtra(EXTRA_ALERT_ID)) return null
             return ReminderAlert(
-                key = intent.getLongExtra(EXTRA_ALERT_KEY, 0L),
+                alertId = intent.getLongExtra(EXTRA_ALERT_ID, 0L),
                 eventId = intent.getLongExtra(EXTRA_EVENT_ID, 0L),
                 calendarId = intent.getLongExtra(EXTRA_CALENDAR_ID, 0L),
                 beginMillis = intent.getLongExtra(EXTRA_BEGIN, 0L),

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderAlarms.kt

@@ -1,64 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import androidx.core.content.getSystemService
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * True on API < 31 (no restriction), and on 31+ when the exact-alarm capability
- * is held — auto-granted via `USE_EXACT_ALARM` on API 33+ (Calendula is a
- * calendar app), user-revocable on 31–32.
- */
-internal fun AlarmManager.canScheduleExactCompat(): Boolean =
-    Build.VERSION.SDK_INT < Build.VERSION_CODES.S || canScheduleExactAlarms()
-
-/**
- * Holds the app's own wake-up for the next reminder (#75). Exactly one alarm
- * exists at a time, for the earliest reminder ahead; every firing re-scans and
- * re-arms. Exact, with an inexact allow-while-idle fallback where the OS
- * withholds the capability (API 31–32 with the permission revoked).
- */
-@Singleton
-class ReminderAlarmScheduler @Inject constructor(
-    @ApplicationContext private val context: Context,
-) {
-
-    fun scheduleScan(triggerAtMillis: Long) {
-        val alarmManager = context.getSystemService<AlarmManager>() ?: return
-        val pendingIntent = scanPendingIntent(PendingIntent.FLAG_UPDATE_CURRENT)
-        if (alarmManager.canScheduleExactCompat()) {
-            alarmManager.setExactAndAllowWhileIdle(
-                AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent,
-            )
-        } else {
-            alarmManager.setAndAllowWhileIdle(
-                AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent,
-            )
-        }
-    }
-
-    /** Drop the pending wake-up — reminders are off, or there is nothing to wait for. */
-    fun cancelScan() {
-        val alarmManager = context.getSystemService<AlarmManager>() ?: return
-        alarmManager.cancel(scanPendingIntent(PendingIntent.FLAG_UPDATE_CURRENT))
-    }
-
-    private fun scanPendingIntent(flags: Int): PendingIntent = PendingIntent.getBroadcast(
-        context,
-        SCAN_REQUEST_CODE,
-        Intent(context, ReminderScheduleReceiver::class.java)
-            .setAction(ReminderScheduleReceiver.ACTION_SCAN),
-        flags or PendingIntent.FLAG_IMMUTABLE,
-    )
-
-    private companion object {
-        // Fixed: there is only ever one scan alarm, and re-arming must replace it.
-        const val SCAN_REQUEST_CODE = 0x5CA1
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderAlert.kt

@@ -1,32 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import de.jeanlucmakiola.calendula.domain.reminders.PlannedReminder
-
-/**
- * One reminder as the notification layer needs it: what to show, and the stable
- * [key] identifying it across a reboot, a re-scan and a reinstall. Derived from
- * the reminder itself (see [PlannedReminder.key]) — in-house delivery has no
- * `CalendarAlerts` row to take an id from (#75).
- */
-data class ReminderAlert(
-    val key: Long,
-    val eventId: Long,
-    val calendarId: Long,
-    val beginMillis: Long,
-    val endMillis: Long,
-    /** Raw event title; may be blank — the notifier substitutes "(no title)". */
-    val title: String,
-    val location: String?,
-    val isAllDay: Boolean,
-)
-
-fun PlannedReminder.toAlert(): ReminderAlert = ReminderAlert(
-    key = key,
-    eventId = instance.eventId,
-    calendarId = instance.calendarId,
-    beginMillis = instance.beginMillis,
-    endMillis = instance.endMillis,
-    title = instance.title,
-    location = instance.location,
-    isAllDay = instance.isAllDay,
-)

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderAlertStore.kt

@@ -0,0 +1,115 @@
+package de.jeanlucmakiola.calendula.data.reminders
+
+import android.content.ContentValues
+import android.content.Context
+import android.provider.CalendarContract
+import android.util.Log
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * One due row of the provider's `CalendarAlerts` table (a join with Events).
+ * Stays in the data layer: alerts feed the notification path only and never
+ * reach a screen, so there is no domain model for them.
+ */
+data class ReminderAlert(
+    val alertId: Long,
+    val eventId: Long,
+    val calendarId: Long,
+    val beginMillis: Long,
+    val endMillis: Long,
+    /** Raw event title; may be blank — the notifier substitutes "(no title)". */
+    val title: String,
+    val location: String?,
+    val isAllDay: Boolean,
+)
+
+/**
+ * Seam over the `CalendarAlerts` table so the receiver logic can be exercised
+ * without a ContentResolver. The provider creates these rows itself — only
+ * for `METHOD_ALERT` reminders (verified in AOSP `CalendarAlarmManager`), so
+ * email reminders never show up here.
+ */
+interface ReminderAlertStore {
+
+    /** Alerts that are due (`ALARM_TIME` has passed) and still unhandled. */
+    fun dueAlerts(nowMillis: Long): List<ReminderAlert>
+
+    /**
+     * Mark the given alerts handled (`STATE_FIRED`) so a later broadcast does
+     * not surface them again. Best effort: this write needs `WRITE_CALENDAR`,
+     * which the user may have declined — then re-broadcasts silently replace
+     * the already-posted notifications instead (same tag, alert-once).
+     */
+    fun markFired(alertIds: List<Long>, nowMillis: Long)
+}
+
+@Singleton
+class AndroidReminderAlertStore @Inject constructor(
+    @ApplicationContext private val context: Context,
+) : ReminderAlertStore {
+
+    override fun dueAlerts(nowMillis: Long): List<ReminderAlert> = context.contentResolver.query(
+        CalendarContract.CalendarAlerts.CONTENT_URI,
+        PROJECTION,
+        CalendarContract.CalendarAlerts.STATE + " = ? AND " +
+            CalendarContract.CalendarAlerts.ALARM_TIME + " <= ?",
+        arrayOf(
+            CalendarContract.CalendarAlerts.STATE_SCHEDULED.toString(),
+            nowMillis.toString(),
+        ),
+        CalendarContract.CalendarAlerts.BEGIN + " ASC",
+    )?.use { c ->
+        buildList {
+            while (c.moveToNext()) {
+                add(
+                    ReminderAlert(
+                        alertId = c.getLong(0),
+                        eventId = c.getLong(1),
+                        calendarId = c.getLong(2),
+                        beginMillis = c.getLong(3),
+                        endMillis = c.getLong(4),
+                        title = c.getString(5).orEmpty(),
+                        location = c.getString(6)?.takeIf { it.isNotBlank() },
+                        isAllDay = c.getInt(7) == 1,
+                    ),
+                )
+            }
+        }
+    } ?: emptyList()
+
+    override fun markFired(alertIds: List<Long>, nowMillis: Long) {
+        if (alertIds.isEmpty()) return
+        val values = ContentValues().apply {
+            put(CalendarContract.CalendarAlerts.STATE, CalendarContract.CalendarAlerts.STATE_FIRED)
+            put(CalendarContract.CalendarAlerts.RECEIVED_TIME, nowMillis)
+            put(CalendarContract.CalendarAlerts.NOTIFY_TIME, nowMillis)
+        }
+        try {
+            context.contentResolver.update(
+                CalendarContract.CalendarAlerts.CONTENT_URI,
+                values,
+                CalendarContract.CalendarAlerts._ID +
+                    " IN (" + alertIds.joinToString(",") + ")",
+                null,
+            )
+        } catch (e: SecurityException) {
+            Log.w(TAG, "Cannot mark alerts fired without WRITE_CALENDAR", e)
+        }
+    }
+
+    private companion object {
+        const val TAG = "ReminderAlertStore"
+        val PROJECTION = arrayOf(
+            CalendarContract.CalendarAlerts._ID,
+            CalendarContract.CalendarAlerts.EVENT_ID,
+            CalendarContract.CalendarAlerts.CALENDAR_ID,
+            CalendarContract.CalendarAlerts.BEGIN,
+            CalendarContract.CalendarAlerts.END,
+            CalendarContract.CalendarAlerts.TITLE,
+            CalendarContract.CalendarAlerts.EVENT_LOCATION,
+            CalendarContract.CalendarAlerts.ALL_DAY,
+        )
+    }
+}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderInstanceSource.kt

@@ -1,121 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import android.content.Context
-import android.content.ContentUris
-import android.provider.CalendarContract
-import dagger.hilt.android.qualifiers.ApplicationContext
-import de.jeanlucmakiola.calendula.domain.reminders.ReminderEventInstance
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * The read side of in-house reminder delivery: occurrences and their reminder
- * offsets, read from `Instances` and `Reminders` rather than `CalendarAlerts`,
- * which cannot be assumed to be written (#75).
- *
- * An interface so [ReminderScanner] can be exercised on the JVM.
- */
-interface ReminderInstanceSource {
-
-    /** Occurrences overlapping `[fromMillis, toMillis]`, of switched-on calendars. */
-    fun occurrences(fromMillis: Long, toMillis: Long): List<ReminderEventInstance>
-
-    /** `METHOD_ALERT` reminder offsets per event id, for the given events. */
-    fun reminderMinutes(eventIds: Collection<Long>): Map<Long, List<Int>>
-
-    /**
-     * The largest `METHOD_ALERT` offset anywhere in the table, so the query
-     * window can be stretched to cover it and a long-lead reminder is planned
-     * before it comes due rather than firing late.
-     */
-    fun longestReminderMinutes(): Int
-}
-
-@Singleton
-class ProviderReminderInstanceSource @Inject constructor(
-    @ApplicationContext private val context: Context,
-) : ReminderInstanceSource {
-
-    override fun occurrences(fromMillis: Long, toMillis: Long): List<ReminderEventInstance> {
-        val uri = CalendarContract.Instances.CONTENT_URI.buildUpon().apply {
-            ContentUris.appendId(this, fromMillis)
-            ContentUris.appendId(this, toMillis)
-        }.build()
-        // `visible` is the flag the app's one visibility model writes (#75).
-        // The status clause mirrors CalendarDataSource.instances: NULL means
-        // "normal", so a bare `!= CANCELED` would drop every ordinary event.
-        val selection = "${CalendarContract.Calendars.VISIBLE} = 1 AND " +
-            "(${CalendarContract.Instances.STATUS} IS NULL OR " +
-            "${CalendarContract.Instances.STATUS} != ${CalendarContract.Events.STATUS_CANCELED})"
-        return context.contentResolver.query(
-            uri, OCCURRENCE_PROJECTION, selection, null, null,
-        )?.use { c ->
-            buildList {
-                while (c.moveToNext()) {
-                    add(
-                        ReminderEventInstance(
-                            eventId = c.getLong(0),
-                            calendarId = c.getLong(1),
-                            beginMillis = c.getLong(2),
-                            endMillis = if (c.isNull(3)) 0L else c.getLong(3),
-                            title = c.getString(4).orEmpty(),
-                            location = c.getString(5)?.takeIf { it.isNotBlank() },
-                            isAllDay = c.getInt(6) == 1,
-                        ),
-                    )
-                }
-            }
-        } ?: emptyList()
-    }
-
-    override fun reminderMinutes(eventIds: Collection<Long>): Map<Long, List<Int>> {
-        if (eventIds.isEmpty()) return emptyMap()
-        val out = mutableMapOf<Long, MutableList<Int>>()
-        // Batched: the ids go into the selection literally, and an unbounded
-        // `IN (...)` would grow the SQL past what SQLite takes.
-        eventIds.distinct().chunked(EVENT_ID_BATCH).forEach { batch ->
-            context.contentResolver.query(
-                CalendarContract.Reminders.CONTENT_URI,
-                REMINDER_PROJECTION,
-                "${CalendarContract.Reminders.METHOD} = " +
-                    "${CalendarContract.Reminders.METHOD_ALERT} AND " +
-                    "${CalendarContract.Reminders.EVENT_ID} IN (${batch.joinToString(",")})",
-                null,
-                null,
-            )?.use { c ->
-                while (c.moveToNext()) {
-                    out.getOrPut(c.getLong(0)) { mutableListOf() } += c.getInt(1)
-                }
-            }
-        }
-        return out
-    }
-
-    override fun longestReminderMinutes(): Int = context.contentResolver.query(
-        CalendarContract.Reminders.CONTENT_URI,
-        arrayOf(CalendarContract.Reminders.MINUTES),
-        "${CalendarContract.Reminders.METHOD} = ${CalendarContract.Reminders.METHOD_ALERT}",
-        null,
-        // One row is enough: the provider passes the sort order to SQLite.
-        "${CalendarContract.Reminders.MINUTES} DESC",
-    )?.use { c -> if (c.moveToFirst()) c.getInt(0) else 0 } ?: 0
-
-    private companion object {
-        const val EVENT_ID_BATCH = 50
-
-        val OCCURRENCE_PROJECTION = arrayOf(
-            CalendarContract.Instances.EVENT_ID,
-            CalendarContract.Instances.CALENDAR_ID,
-            CalendarContract.Instances.BEGIN,
-            CalendarContract.Instances.END,
-            CalendarContract.Instances.TITLE,
-            CalendarContract.Instances.EVENT_LOCATION,
-            CalendarContract.Instances.ALL_DAY,
-        )
-
-        val REMINDER_PROJECTION = arrayOf(
-            CalendarContract.Reminders.EVENT_ID,
-            CalendarContract.Reminders.MINUTES,
-        )
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderMaintenanceWorker.kt

@@ -1,62 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import android.content.Context
-import android.util.Log
-import androidx.work.CoroutineWorker
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import androidx.work.WorkerParameters
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.android.EntryPointAccessors
-import dagger.hilt.components.SingletonComponent
-import java.util.concurrent.TimeUnit
-
-/**
- * The backstop under the alarm: a daily scan that runs whether or not the alarm
- * survived. Finds nothing to do in the steady state; it exists for the device
- * that quietly drops the alarm without a reboot to announce it (#75).
- */
-object ReminderMaintenanceScheduler {
-
-    private const val WORK_NAME = "reminder-scan-maintenance"
-
-    /** Enqueue the daily backstop; idempotent, so every launch may call it. */
-    fun apply(context: Context) {
-        val request = PeriodicWorkRequestBuilder<ReminderMaintenanceWorker>(1, TimeUnit.DAYS)
-            // The launch scan covers now; let the first periodic run wait.
-            .setInitialDelay(1, TimeUnit.DAYS)
-            .build()
-        WorkManager.getInstance(context)
-            .enqueueUniquePeriodicWork(WORK_NAME, ExistingPeriodicWorkPolicy.UPDATE, request)
-    }
-}
-
-class ReminderMaintenanceWorker(
-    appContext: Context,
-    params: WorkerParameters,
-) : CoroutineWorker(appContext, params) {
-
-    @EntryPoint
-    @InstallIn(SingletonComponent::class)
-    interface Deps {
-        fun reminderScanner(): ReminderScanner
-    }
-
-    override suspend fun doWork(): Result = try {
-        EntryPointAccessors.fromApplication(applicationContext, Deps::class.java)
-            .reminderScanner()
-            .scan()
-        Result.success()
-    } catch (e: Exception) {
-        // The scan swallows its own failures, so anything reaching here is the
-        // entry point itself — a retry will not mend it.
-        Log.w(TAG, "Reminder maintenance scan failed", e)
-        Result.success()
-    }
-
-    private companion object {
-        const val TAG = "ReminderMaintenance"
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderNotifier.kt

@@ -14,7 +14,6 @@ import androidx.core.content.ContextCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import de.jeanlucmakiola.calendula.MainActivity
 import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.data.calendar.CalendarDataSource
 import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import de.jeanlucmakiola.calendula.data.prefs.is24Hour
@@ -29,20 +28,17 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Posts one notification per due reminder on a dedicated channel. Tapping opens
+ * Posts one notification per due reminder alert on a dedicated channel.
- * the event's detail screen.
+ * Tapping opens the event's detail screen; the tag is the alert id, so a
- *
+ * re-broadcast of an alert we couldn't mark fired replaces its notification
- * The tag is the reminder's stable key, so a scan that posts the same reminder
+ * silently ([NotificationCompat.Builder.setOnlyAlertOnce]) instead of
- * again — a catch-up pass overlapping the alarm that already fired — replaces
+ * duplicating it.
- * its notification silently ([NotificationCompat.Builder.setOnlyAlertOnce])
- * instead of stacking a second one.
  */
 @Singleton
 class ReminderNotifier @Inject constructor(
     @ApplicationContext private val context: Context,
     private val settingsPrefs: SettingsPrefs,
     private val calendarPrefs: CalendarPrefs,
-    private val calendarDataSource: CalendarDataSource,
 ) {
 
     /** False when the user declined `POST_NOTIFICATIONS` or muted the app. */
@@ -53,23 +49,12 @@ class ReminderNotifier @Inject constructor(
         return granted && NotificationManagerCompat.from(context).areNotificationsEnabled()
     }
 
-    /**
+    suspend fun post(alert: ReminderAlert) {
-     * The single choke point for "this calendar is switched off", covering the
+        // The single choke point for the disabled-calendar gate: it covers both
-     * two paths that reach [post] around the scan's own filter: a snooze armed
+        // the provider broadcast (EventReminderReceiver) and a snoozed re-show
-     * before the switch-off, and a read-only install whose switch lives in
+        // (ReminderActionReceiver), so a calendar disabled after a snooze no
-     * [CalendarPrefs].
+        // longer notifies — without either receiver duplicating the check.
-     */
+        if (alert.isForDisabledCalendar(calendarPrefs.disabledCalendarIds.first())) return
-    private suspend fun isSilenced(calendarId: Long): Boolean =
-        calendarId in calendarPrefs.pendingDisabledCalendarIds.first() ||
-            calendarDataSource.isCalendarVisible(calendarId) == false
-
-    /**
-     * Post [alert], unless its calendar is switched off. Returns whether the
-     * notification was put up, which the snooze re-show path uses to tell a
-     * silenced reminder from a delivered one.
-     */
-    suspend fun post(alert: ReminderAlert): Boolean {
-        if (isSilenced(alert.calendarId)) return false
         ensureChannel()
         val title = alert.title.ifBlank { context.getString(R.string.event_untitled) }
         val is24Hour = settingsPrefs.timeFormat.first()
@@ -116,18 +101,16 @@ class ReminderNotifier @Inject constructor(
             .build()
         try {
             NotificationManagerCompat.from(context)
-                .notify(alert.key.toString(), NOTIFICATION_ID, notification)
+                .notify(alert.alertId.toString(), NOTIFICATION_ID, notification)
         } catch (e: SecurityException) {
             // POST_NOTIFICATIONS was revoked between canPost() and here.
             Log.w(TAG, "Could not post reminder for event ${alert.eventId}", e)
         }
-        // Handled either way — a retry hits the same revoked permission.
-        return true
     }
 
     /** Remove a posted reminder (snooze re-shows it later; dismiss is final). */
     fun cancel(alert: ReminderAlert) {
-        NotificationManagerCompat.from(context).cancel(alert.key.toString(), NOTIFICATION_ID)
+        NotificationManagerCompat.from(context).cancel(alert.alertId.toString(), NOTIFICATION_ID)
     }
 
     private fun actionIntent(alert: ReminderAlert, action: String): PendingIntent =
@@ -140,10 +123,7 @@ class ReminderNotifier @Inject constructor(
 
     private fun detailIntent(alert: ReminderAlert): PendingIntent = PendingIntent.getActivity(
         context,
-        // Shares the per-(alert, action) request-code scheme with the buttons.
+        /* requestCode = */ alert.alertId.toInt(),
-        /* requestCode = */ ReminderActionReceiver.requestCode(
-            alert, ReminderActionReceiver.ACTION_OPEN,
-        ),
         MainActivity.eventDetailIntent(context, alert.eventId, alert.beginMillis, alert.endMillis),
         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
     )

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderScanner.kt

@@ -1,158 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.util.Log
-import androidx.core.content.ContextCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import de.jeanlucmakiola.calendula.data.calendar.CalendarDataSource
-import de.jeanlucmakiola.calendula.data.di.IoDispatcher
-import de.jeanlucmakiola.calendula.data.prefs.ReminderStatePrefs
-import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
-import de.jeanlucmakiola.calendula.domain.reminders.planReminders
-import de.jeanlucmakiola.calendula.domain.reminders.reminderQueryHorizon
-import de.jeanlucmakiola.calendula.domain.reminders.reminderWatermark
-import de.jeanlucmakiola.calendula.domain.reminders.scheduleReminders
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import java.time.ZoneId
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * One pass of in-house reminder delivery: read what is planned, post what has
- * come due, and arm the next wake-up. Every trigger runs the same [scan], and
- * re-running is always safe — the watermark in [ReminderStatePrefs] decides what
- * is owed, not the trigger.
- */
-@Singleton
-class ReminderScanner @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val source: ReminderInstanceSource,
-    private val calendarDataSource: CalendarDataSource,
-    private val notifier: ReminderNotifier,
-    private val alarms: ReminderAlarmScheduler,
-    private val state: ReminderStatePrefs,
-    private val settingsPrefs: SettingsPrefs,
-    @IoDispatcher private val io: kotlinx.coroutines.CoroutineDispatcher,
-) {
-
-    // Triggers overlap freely (an alarm during a burst of edits); serialize so
-    // two passes can't both read the same watermark and post the same reminder.
-    private val scanLock = Mutex()
-
-    private val scope = CoroutineScope(SupervisorJob() + io)
-    private val providerChanges = MutableSharedFlow<Unit>(
-        replay = 0, extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST,
-    )
-    private var watching = false
-
-    suspend fun scan() = withContext(io) {
-        scanLock.withLock {
-            try {
-                runScan()
-            } catch (e: SecurityException) {
-                // Permission revoked mid-flight; the next grant re-scans.
-                Log.w(TAG, "Reminder scan lacks the calendar permission", e)
-            } catch (e: Exception) {
-                Log.w(TAG, "Reminder scan failed", e)
-            }
-        }
-    }
-
-    private suspend fun runScan() {
-        val now = System.currentTimeMillis()
-        if (!hasReadCalendar()) return
-
-        if (!settingsPrefs.remindersEnabled.first()) {
-            // Reminders off: drop the wake-up, but keep the watermark moving
-            // so switching them back on doesn't replay the backlog.
-            alarms.cancelScan()
-            state.setLastScanMillis(now)
-            return
-        }
-
-        val lookahead = reminderQueryHorizon(LOOKAHEAD_MILLIS, source.longestReminderMinutes())
-        // Reach into the past too: an all-day "at time of event" encodes to a
-        // negative offset, and a catch-up pass needs the occurrences it missed.
-        val occurrences = source.occurrences(now - PAST_WINDOW_MILLIS, now + lookahead)
-        val planned = planReminders(
-            instances = occurrences,
-            minutesByEvent = source.reminderMinutes(occurrences.map { it.eventId }),
-            zone = ZoneId.systemDefault(),
-            allDayTimeMinutes = settingsPrefs.allDayReminderTimeMinutes.first(),
-        )
-
-        val schedule = scheduleReminders(
-            planned = planned,
-            lastFiredMillis = reminderWatermark(state.lastScanMillis(), now),
-            nowMillis = now,
-            horizonMillis = now + MAX_ALARM_INTERVAL_MILLIS,
-        )
-
-        if (notifier.canPost()) {
-            schedule.due.forEach { notifier.post(it.toAlert()) }
-        }
-        // Advance even when nothing could be posted, so muting notifications
-        // doesn't build a backlog.
-        state.setLastScanMillis(now)
-        alarms.scheduleScan(schedule.nextAlarmMillis)
-    }
-
-    private fun hasReadCalendar(): Boolean = ContextCompat.checkSelfPermission(
-        context, Manifest.permission.READ_CALENDAR,
-    ) == PackageManager.PERMISSION_GRANTED
-
-    /**
-     * Re-scan when the provider changes, so a saved or deleted event re-arms the
-     * alarm at once. Debounced, since a single save lands as several
-     * notifications. Process-lifetime only; other triggers cover the rest.
-     */
-    fun startWatchingProvider() {
-        if (watching) return
-        watching = true
-        providerChanges
-            .debounce(PROVIDER_CHANGE_DEBOUNCE_MILLIS)
-            .onEach { scan() }
-            .launchIn(scope)
-        calendarDataSource.registerChangeListener { providerChanges.tryEmit(Unit) }
-    }
-
-    /** Fire-and-forget scan for callers that are not in a coroutine already. */
-    fun scanInBackground() {
-        scope.launch(start = CoroutineStart.DEFAULT) { scan() }
-    }
-
-    private companion object {
-        const val TAG = "ReminderScanner"
-
-        /**
-         * How far ahead occurrences are read. Stretched further by the longest
-         * reminder offset in the table, so this is only the floor.
-         */
-        const val LOOKAHEAD_MILLIS = 7L * 24 * 60 * 60 * 1000
-
-        /** How far back to look for occurrences that may still owe a reminder. */
-        const val PAST_WINDOW_MILLIS = 24L * 60 * 60 * 1000
-
-        /**
-         * Never wait longer than a day for the next pass: it rolls the lookahead
-         * window forward and re-arms an alarm the system may have dropped.
-         */
-        const val MAX_ALARM_INTERVAL_MILLIS = 24L * 60 * 60 * 1000
-
-        const val PROVIDER_CHANGE_DEBOUNCE_MILLIS = 2_000L
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderScheduleReceiver.kt

@@ -1,53 +0,0 @@
-package de.jeanlucmakiola.calendula.data.reminders
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-/**
- * Every out-of-process reason to re-run a reminder scan: our own [ACTION_SCAN]
- * alarm, boot and package-replaced (both wipe pending alarms), and time or
- * timezone changes (both move reminders relative to the armed alarm). All do the
- * same thing, since [ReminderScanner.scan] is idempotent.
- *
- * Exported for the system broadcasts; an early scan triggered by another app is
- * harmless.
- */
-@AndroidEntryPoint
-class ReminderScheduleReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var scanner: ReminderScanner
-
-    override fun onReceive(context: Context, intent: Intent) {
-        // Checked despite every action doing the same thing: the receiver is
-        // exported and the broadcasts it takes are protected, so any other
-        // action did not come from where it claims to.
-        if (intent.action !in HANDLED_ACTIONS) return
-        val pendingResult = goAsync()
-        CoroutineScope(SupervisorJob() + Dispatchers.IO).launch {
-            try {
-                scanner.scan()
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
-    companion object {
-        const val ACTION_SCAN = "de.jeanlucmakiola.calendula.reminders.SCAN"
-
-        private val HANDLED_ACTIONS = setOf(
-            ACTION_SCAN,
-            Intent.ACTION_BOOT_COMPLETED,
-            Intent.ACTION_MY_PACKAGE_REPLACED,
-            Intent.ACTION_TIME_CHANGED,
-            Intent.ACTION_TIMEZONE_CHANGED,
-        )
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderSnoozeScheduler.kt

@@ -10,13 +10,14 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Schedules a one-off exact alarm that re-shows a snoozed reminder. Separate
+ * Schedules a one-off exact alarm that re-shows a snoozed reminder.
- * from [ReminderAlarmScheduler]'s single moving scan alarm: a snooze is pinned
- * to one reminder and has to outlive the watermark moving past it, so it carries
- * the reminder in its own intent.
  *
- * Falls back to an inexact allow-while-idle alarm where the OS withholds the
+ * The app otherwise relies entirely on the calendar provider's `EVENT_REMINDER`
- * exact-alarm capability (API 31–32 with the permission revoked).
+ * broadcast (the Etar model), but a snoozed reminder has no provider backing —
+ * its `CalendarAlerts` row is already fired — so we must re-fire it ourselves.
+ * A snooze that lands late is a broken snooze, hence an *exact* alarm; we fall
+ * back to an inexact allow-while-idle alarm only if the OS withholds the
+ * exact-alarm capability (API 31–32 where the user revoked it).
  */
 @Singleton
 class ReminderSnoozeScheduler @Inject constructor(
@@ -36,8 +37,8 @@ class ReminderSnoozeScheduler @Inject constructor(
                 AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent,
             )
         } else {
-            // Exact alarms revoked (API 31–32); an inexact wake is the best
+            // Exact alarms revoked (API 31–32): an inexact wake is the honest
-            // available without nagging for SCHEDULE_EXACT_ALARM.
+            // best we can do without nagging for SCHEDULE_EXACT_ALARM.
             alarmManager.setAndAllowWhileIdle(
                 AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent,
             )

app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/SuppressedReminderStore.kt

@@ -0,0 +1,130 @@
+package de.jeanlucmakiola.calendula.data.reminders
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.MutablePreferences
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import java.util.Base64
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Still relevant while the event has not ended: a reminder for an event that is
+ * already over is pointless to re-surface. Falls back to the begin time when the
+ * end is unknown (0L). Used both to decide what to re-post and to purge the stash.
+ */
+internal fun ReminderAlert.isRelevantAt(nowMillis: Long): Boolean =
+    (endMillis.takeIf { it > 0L } ?: beginMillis) >= nowMillis
+
+/**
+ * Local stash of reminder alerts that fired while their calendar was disabled
+ * in-app. [EventReminderReceiver] marks every due alert `STATE_FIRED` regardless
+ * (so the provider stops re-broadcasting the suppressed ones), which would
+ * otherwise lose those reminders forever — there is no re-scan. Stashing lets
+ * [de.jeanlucmakiola.calendula.ui.calendars.CalendarsViewModel] re-post them if
+ * the user re-enables the calendar before the event is over.
+ *
+ * Persisted in the shared preferences DataStore as a set of self-describing
+ * strings (one per alert); the stash never reaches a screen, so there is no
+ * domain model. Entries whose event has already ended are dropped on the next
+ * stash/recover/purge, so the stash only ever holds a handful of pending alerts.
+ */
+@Singleton
+class SuppressedReminderStore @Inject constructor(
+    private val store: DataStore<Preferences>,
+) {
+
+    /** Add [alerts] to the stash, replacing any existing entry with the same id. */
+    suspend fun stash(alerts: List<ReminderAlert>, nowMillis: Long) {
+        if (alerts.isEmpty()) return
+        store.edit { prefs ->
+            val byId = decodeAll(prefs).associateByTo(mutableMapOf()) { it.alertId }
+            alerts.forEach { byId[it.alertId] = it }
+            prefs.putStash(byId.values.filter { it.isRelevantAt(nowMillis) })
+        }
+    }
+
+    /**
+     * Remove and return the still-relevant stashed alerts belonging to any of
+     * [calendarIds]; drops expired entries for every calendar in passing.
+     */
+    suspend fun recoverFor(calendarIds: Set<Long>, nowMillis: Long): List<ReminderAlert> {
+        val recovered = mutableListOf<ReminderAlert>()
+        store.edit { prefs ->
+            val kept = decodeAll(prefs).filter { alert ->
+                when {
+                    !alert.isRelevantAt(nowMillis) -> false // expired: drop
+                    alert.calendarId in calendarIds -> { recovered += alert; false }
+                    else -> true
+                }
+            }
+            prefs.putStash(kept)
+        }
+        return recovered
+    }
+
+    /** Drop entries whose event has already ended — cheap opportunistic cleanup. */
+    suspend fun purgeExpired(nowMillis: Long) {
+        store.edit { prefs ->
+            prefs.putStash(decodeAll(prefs).filter { it.isRelevantAt(nowMillis) })
+        }
+    }
+
+    private fun decodeAll(prefs: Preferences): List<ReminderAlert> =
+        prefs[KEY].orEmpty().mapNotNull { decodeStashEntry(it) }
+
+    private fun MutablePreferences.putStash(alerts: List<ReminderAlert>) {
+        val encoded = alerts.map { encodeStashEntry(it) }.toSet()
+        if (encoded.isEmpty()) remove(KEY) else set(KEY, encoded)
+    }
+
+    private companion object {
+        val KEY = stringSetPreferencesKey("suppressed_reminders")
+    }
+}
+
+// One stash entry as a delimited string. The '|' separator is safe because every
+// free-text field is Base64-encoded first (that alphabet never contains '|'), and
+// a null location is stored as a distinct sentinel that Base64 also never yields.
+private const val FIELD_SEP = "|"
+private const val NULL_LOCATION = "-"
+
+internal fun encodeStashEntry(alert: ReminderAlert): String = listOf(
+    alert.alertId.toString(),
+    alert.eventId.toString(),
+    alert.calendarId.toString(),
+    alert.beginMillis.toString(),
+    alert.endMillis.toString(),
+    if (alert.isAllDay) "1" else "0",
+    alert.title.toBase64(),
+    alert.location?.toBase64() ?: NULL_LOCATION,
+).joinToString(FIELD_SEP)
+
+/** Reverse of [encodeStashEntry]; returns null for a malformed entry (dropped). */
+internal fun decodeStashEntry(raw: String): ReminderAlert? {
+    val parts = raw.split(FIELD_SEP)
+    if (parts.size != 8) return null
+    return try {
+        ReminderAlert(
+            alertId = parts[0].toLong(),
+            eventId = parts[1].toLong(),
+            calendarId = parts[2].toLong(),
+            beginMillis = parts[3].toLong(),
+            endMillis = parts[4].toLong(),
+            title = parts[6].fromBase64(),
+            location = parts[7].takeIf { it != NULL_LOCATION }?.fromBase64(),
+            isAllDay = parts[5] == "1",
+        )
+    } catch (e: NumberFormatException) {
+        null
+    } catch (e: IllegalArgumentException) { // bad Base64
+        null
+    }
+}
+
+private fun String.toBase64(): String =
+    Base64.getEncoder().encodeToString(toByteArray(Charsets.UTF_8))
+
+private fun String.fromBase64(): String =
+    String(Base64.getDecoder().decode(this), Charsets.UTF_8)

app/src/main/java/de/jeanlucmakiola/calendula/domain/CalendarRowState.kt

@@ -1,68 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-/**
- * The ways a calendar can behave unlike a plain, writable one — each a reason it
- * is missing from the event and import pickers (#76).
- */
-enum class CalendarStateLabel {
-    /**
-     * A special-dates mirror the app fills from contacts. Writable and visible,
-     * yet no event target: anything authored here is deleted by the next sync.
-     */
-    MANAGED,
-
-    /** Contents can't be modified: a WebCal subscription, a read-only share. */
-    READ_ONLY,
-
-    /** The account holds the events, but this device isn't syncing them down. */
-    NOT_SYNCED,
-}
-
-/**
- * Whether the account keeps this calendar's events off the device
- * (`Calendars.SYNC_EVENTS = 0`) — empty by construction. Device-local calendars
- * are excluded: nothing syncs them by definition, and one from another app can
- * hold real events at `sync_events = 0`.
- */
-val CalendarSource.isNotSynced: Boolean
-    get() = !syncsEvents && !isLocal
-
-/**
- * Whether a visibility switch on this calendar can change anything the user
- * would see — it can't for a non-syncing one, with no events on the device.
- */
-val CalendarSource.hasVisibilitySwitch: Boolean
-    get() = !isNotSynced
-
-/**
- * Whether this calendar can be offered as a target for a new or imported event.
- * The one predicate behind both pickers, so the states [CalendarStateLabel]
- * names on a manager row are exactly the states that keep a calendar out of them
- * (#76). An event already living in an excluded calendar keeps it; the editor
- * adds that calendar back to its picker.
- */
-val CalendarSource.isEventTarget: Boolean
-    get() = canModifyContents && isVisibleInSystem && !isManaged && !isNotSynced
-
-/**
- * Whether this calendar's events may have their times rewritten by a drag (#68).
- * Deliberately not [isEventTarget]: a managed event stays editable (reminders,
- * notes) yet must never move, since the next contacts sync would put it back.
- */
-val CalendarSource.allowsEventMove: Boolean
-    get() = canModifyContents && !isManaged
-
-/** Every state worth naming on this calendar's row, in reading order. */
-fun CalendarSource.stateLabels(): List<CalendarStateLabel> = buildList {
-    if (isManaged) add(CalendarStateLabel.MANAGED)
-    if (!canModifyContents) add(CalendarStateLabel.READ_ONLY)
-    if (isNotSynced) add(CalendarStateLabel.NOT_SYNCED)
-}
-
-/**
- * Calendar-manager order within one group: the ones you can actually act on
- * first, the non-syncing ones after them. Stable otherwise, so the provider's
- * display-name ordering survives.
- */
-fun List<CalendarSource>.orderedForManager(): List<CalendarSource> =
-    sortedBy { it.isNotSynced }

app/src/main/java/de/jeanlucmakiola/calendula/domain/CalendarVisibilityPlan.kt

@@ -1,48 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-/**
- * The `Calendars.VISIBLE` writes that flush the app's pending "switched off"
- * set into the provider, plus the ids that need no write at all.
- */
-data class CalendarVisibilityPlan(
-    val hide: Set<Long> = emptySet(),
-    val settled: Set<Long> = emptySet(),
-) {
-    val isEmpty: Boolean get() = hide.isEmpty() && settled.isEmpty()
-}
-
-/**
- * Reconcile [pendingDisabledIds] — switch-offs the app could not write, plus
- * what the retired app-local visibility model left behind (#75) — against the
- * calendars actually on the device.
- *
- * Only ever *hides*: switching a system-hidden calendar back on would un-hide it
- * in every other calendar app too. Calendula follows the flag and explains
- * itself once (see [hasSystemHiddenCalendars]).
- *
- * [CalendarVisibilityPlan.settled] carries the ids needing no write — already
- * hidden, or gone from the device.
- */
-fun calendarVisibilityPlan(
-    calendars: List<CalendarSource>,
-    pendingDisabledIds: Set<Long>,
-): CalendarVisibilityPlan {
-    val byId = calendars.associateBy { it.id }
-    val hide = mutableSetOf<Long>()
-    val settled = mutableSetOf<Long>()
-    for (id in pendingDisabledIds) {
-        val calendar = byId[id]
-        // Gone from the device, or already invisible — nothing to write.
-        if (calendar != null && calendar.isVisibleInSystem) hide += id else settled += id
-    }
-    return CalendarVisibilityPlan(hide = hide, settled = settled)
-}
-
-/**
- * Whether any calendar is switched off at system level without Calendula having
- * asked for it — the condition the one-time notice explains.
- */
-fun hasSystemHiddenCalendars(
-    calendars: List<CalendarSource>,
-    pendingDisabledIds: Set<Long>,
-): Boolean = calendars.any { !it.isVisibleInSystem && it.id !in pendingDisabledIds }

app/src/main/java/de/jeanlucmakiola/calendula/domain/EventColorPalette.kt

@@ -1,8 +1,12 @@
 package de.jeanlucmakiola.calendula.domain
 
-import de.jeanlucmakiola.calendula.domain.color.Oklch
+import kotlin.math.abs
-import de.jeanlucmakiola.calendula.domain.color.eventTone
+import kotlin.math.atan2
-import de.jeanlucmakiola.calendula.domain.color.oklchOf
+import kotlin.math.cbrt
+import kotlin.math.hypot
+import kotlin.math.pow
+import kotlin.math.roundToInt
+import kotlin.math.sqrt
 
 /**
  * Curates an account's published event palette for the colour picker.
@@ -14,25 +18,24 @@ import de.jeanlucmakiola.calendula.domain.color.oklchOf
  * (#22).
  *
  * Crucially, curation runs against the colour the picker actually *paints*, not
- * the raw provider value — and it gets that colour from the same [eventTone]
+ * the raw provider value. The picker softens every swatch through [pastelArgb]:
- * the picker calls, rather than from a copy of its shaping kept in step by hand.
+ * it pins lightness to a constant and caps saturation, so the raw palette's
- * Because a harmonised container pins lightness, the raw palette's lightness
+ * lightness axis is invisible on screen. Two raw colours that look different —
- * axis is invisible on screen: two raw colours that look different — a navy and
+ * a navy and a mid blue — paint as one swatch, and every neutral (black, the
- * a mid blue — paint as one swatch, and every neutral (black, the grays, white)
+ * grays, white) paints as the same pale tint. Judging distinctness in raw
- * paints as the same grey. Judging distinctness in raw space, as before, left
+ * space, as before, left near-identical painted swatches and stranded the
- * near-identical painted swatches and stranded the neutrals as a run of
+ * neutrals as a run of look-alike "pinks" at the end of the grid.
- * look-alike tints at the end of the grid.
  *
  * Three steps, all in painted space:
  *  1. Collapse swatches that paint identically to one (alphabetically-first key
  *     wins, deterministically) — this folds aliases, dark/light shades of a
  *     hue, and all the neutrals together.
- *  2. Oversized palettes (> [CURATION_TRIGGER_SIZE]) drop the neutral-origin
+ *  2. Oversized palettes (> [CURATION_TRIGGER_SIZE]) drop the washed-out
- *     swatches — with lightness pinned, a grey source paints as plain grey, so
+ *     neutral-origin tints (painted chroma < [PASTEL_CHROMA_FLOOR]) and are
- *     "has no hue left" is simply zero chroma — and are then thinned to visually
+ *     then thinned to visually distinct colours: most vivid first, a colour is
- *     distinct colours: most vivid first, a colour is kept only when at least
+ *     kept only when at least [MIN_DELTA_E] (CIE76, painted Lab) from every
- *     [MIN_DISTANCE] away in Oklab from every colour already kept. Small
+ *     colour already kept. Small palettes are already curated by their adapter
- *     palettes are already curated by their adapter and pass through whole.
+ *     and pass through whole.
  *  3. The survivors are ordered like a rainbow — continuously by painted hue —
  *     with the wheel cut at its single widest empty gap so the one unavoidable
  *     seam lands in dead space and no hue family is torn across both ends.
@@ -42,12 +45,12 @@ import de.jeanlucmakiola.calendula.domain.color.oklchOf
  */
 fun List<EventColorOption>.curatedForPicker(): List<EventColorOption> {
     val painted = sortedBy { it.key }
-        .distinctBy { paintedArgb(it.argb) }
+        .distinctBy { pastelArgb(it.argb) }
-        .map { it to oklchOf(paintedArgb(it.argb)) }
+        .map { it to Lab.of(pastelArgb(it.argb)) }
     val kept = if (painted.size <= CURATION_TRIGGER_SIZE) {
         painted
     } else {
-        thin(painted.filter { (_, painted) -> painted.chroma > 0f })
+        thin(painted.filter { (_, lab) -> lab.chroma >= PASTEL_CHROMA_FLOOR })
     }
     return orderAroundWheel(kept).map { (option, _) -> option }
 }
@@ -58,17 +61,17 @@ fun List<EventColorOption>.curatedForPicker(): List<EventColorOption> {
  * instead of mid-family. Saturation breaks ties, vivid first.
  */
 private fun orderAroundWheel(
-    swatches: List<Pair<EventColorOption, Oklch>>,
+    swatches: List<Pair<EventColorOption, Lab>>,
-): List<Pair<EventColorOption, Oklch>> {
+): List<Pair<EventColorOption, Lab>> {
     if (swatches.size < 2) return swatches
     val byHue = swatches.sortedWith(
-        compareBy({ (_, painted) -> painted.hue }, { (_, painted) -> -painted.chroma }),
+        compareBy({ (_, lab) -> lab.hue }, { (_, lab) -> -lab.chroma }),
     )
     // Split the wheel after the largest empty arc between neighbouring hues;
     // the default is the wrap gap (last hue back round to the first), i.e. the
     // familiar 0→360 order, and we only rotate away from it for a wider void.
     var cutAfter = byHue.lastIndex
-    var widestGap = 360f - byHue.last().second.hue + byHue.first().second.hue
+    var widestGap = 360.0 - byHue.last().second.hue + byHue.first().second.hue
     for (i in 0 until byHue.lastIndex) {
         val gap = byHue[i + 1].second.hue - byHue[i].second.hue
         if (gap > widestGap) {
@@ -81,32 +84,102 @@ private fun orderAroundWheel(
 
 /** Greedy max-distance filter: vivid colours stake out clusters first. */
 private fun thin(
-    swatches: List<Pair<EventColorOption, Oklch>>,
+    swatches: List<Pair<EventColorOption, Lab>>,
-): List<Pair<EventColorOption, Oklch>> {
+): List<Pair<EventColorOption, Lab>> {
     val byVividness = swatches
-        .sortedWith(
+        .sortedWith(compareByDescending<Pair<EventColorOption, Lab>> { it.second.chroma }.thenBy { it.first.key })
-            compareByDescending<Pair<EventColorOption, Oklch>> { it.second.chroma }
+    val kept = mutableListOf<Pair<EventColorOption, Lab>>()
-                .thenBy { it.first.key },
-        )
-    val kept = mutableListOf<Pair<EventColorOption, Oklch>>()
     for (candidate in byVividness) {
-        if (kept.none { it.second.distanceTo(candidate.second) < MIN_DISTANCE }) kept += candidate
+        if (kept.none { it.second.deltaE(candidate.second) < MIN_DELTA_E }) kept += candidate
     }
     return kept
 }
 
-/** The colour the picker paints for [argb]; the light theme stands in as the
+/**
- *  reference, since a harmonised container differs only in lightness by theme
+ * The softening the colour picker paints over every swatch: keep the hue, scale
- *  and curation compares hue and chroma. */
+ * and clamp saturation into a gentle band, and pin value to a constant so
-private fun paintedArgb(argb: Int): Int =
+ * nothing screams and everything reads on the surface. Value is fixed here so
-    eventTone(argb, dark = false, harmonise = true).container
+ * curation is theme-independent — only hue and saturation distinguish painted
+ * swatches.
+ *
+ * This is a self-contained mirror of floret-kit's `pastelize` hue/saturation
+ * shaping (`de.jeanlucmakiola.floret.components.pastelize`), with value pinned
+ * rather than theme-picked. Curation must reason about the colour the picker
+ * paints, so the two shapings have to agree: if floret's saturation band or
+ * curve changes, update this in step.
+ */
+fun pastelArgb(rawArgb: Int): Int {
+    val r = ((rawArgb shr 16) and 0xFF) / 255f
+    val g = ((rawArgb shr 8) and 0xFF) / 255f
+    val b = (rawArgb and 0xFF) / 255f
+    val max = maxOf(r, g, b)
+    val min = minOf(r, g, b)
+    val delta = max - min
+    val hue = when {
+        delta == 0f -> 0f
+        max == r -> 60f * (((g - b) / delta) % 6f)
+        max == g -> 60f * (((b - r) / delta) + 2f)
+        else -> 60f * (((r - g) / delta) + 4f)
+    }.let { if (it < 0f) it + 360f else it }
+    val sat = (if (max == 0f) 0f else delta / max) * 0.6f
+    val s = sat.coerceIn(0.25f, 0.65f)
+    val v = PASTEL_VALUE
+    val c = v * s
+    val x = c * (1f - abs((hue / 60f) % 2f - 1f))
+    val m = v - c
+    val (rr, gg, bb) = when {
+        hue < 60f -> Triple(c, x, 0f)
+        hue < 120f -> Triple(x, c, 0f)
+        hue < 180f -> Triple(0f, c, x)
+        hue < 240f -> Triple(0f, x, c)
+        hue < 300f -> Triple(x, 0f, c)
+        else -> Triple(c, 0f, x)
+    }
+    fun channel(value: Float) = ((value + m) * 255f).roundToInt().coerceIn(0, 255)
+    return (0xFF shl 24) or (channel(rr) shl 16) or (channel(gg) shl 8) or channel(bb)
+}
+
+/** Reference lightness for curation; the picker paints at this on dark surfaces. */
+private const val PASTEL_VALUE = 0.82f
 
 /** Palettes at most this big skip the thinning (Google's ~26 pass through). */
 private const val CURATION_TRIGGER_SIZE = 36
 
+/** Minimum CIE76 ΔE between surviving painted swatches. */
+private const val MIN_DELTA_E = 13.0
+
 /**
- * Minimum Oklab distance between surviving painted swatches. Painted colours all
+ * Painted-chroma floor for oversized palettes: below this a swatch is a washed-
- * share one lightness, so this is really a hue/chroma separation — far enough
+ * out tint — the neutrals and near-whites the saturation clamp muddies — so it
- * apart that two swatches never read as the same colour in the grid.
+ * is dropped rather than shown as pale filler.
  */
-private const val MIN_DISTANCE = 0.025f
+private const val PASTEL_CHROMA_FLOOR = 22.0
+
+/** CIE Lab (D65) — the space where Euclidean distance ≈ perceived difference. */
+private class Lab(val l: Double, val a: Double, val b: Double) {
+    val chroma: Double get() = hypot(a, b)
+
+    /** Hue angle in degrees, 0–360, around the Lab a-b plane. */
+    val hue: Double get() = (Math.toDegrees(atan2(b, a)) + 360.0) % 360.0
+
+    fun deltaE(other: Lab): Double =
+        sqrt((l - other.l).pow(2) + (a - other.a).pow(2) + (b - other.b).pow(2))
+
+    companion object {
+        fun of(argb: Int): Lab {
+            fun linear(shift: Int): Double {
+                val c = ((argb shr shift) and 0xFF) / 255.0
+                return if (c <= 0.04045) c / 12.92 else ((c + 0.055) / 1.055).pow(2.4)
+            }
+            val r = linear(16)
+            val g = linear(8)
+            val b = linear(0)
+            val x = (0.4124 * r + 0.3576 * g + 0.1805 * b) / 0.95047
+            val y = 0.2126 * r + 0.7152 * g + 0.0722 * b
+            val z = (0.0193 * r + 0.1192 * g + 0.9505 * b) / 1.08883
+            fun f(t: Double) = if (t > 0.008856) cbrt(t) else 7.787 * t + 16.0 / 116.0
+            val fy = f(y)
+            return Lab(116 * fy - 16, 500 * (f(x) - fy), 200 * (fy - f(z)))
+        }
+    }
+}

app/src/main/java/de/jeanlucmakiola/calendula/domain/EventForm.kt

@@ -4,14 +4,13 @@ import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.LocalTime
 import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Instant
 
 /**
  * User input for creating an event (and, from v1.3, editing one). Times are
- * wall-clock values in [timezone]; the data layer translates them to provider
+ * wall-clock values in the device zone; the data layer translates them to
- * millis (all-day events normalise to UTC midnights there).
+ * provider millis (all-day events normalise to UTC midnights there).
  */
 data class EventForm(
     val calendarId: Long?,
@@ -19,23 +18,6 @@ data class EventForm(
     val isAllDay: Boolean = false,
     val start: LocalDateTime,
     val end: LocalDateTime,
-    /**
-     * The zone [start]/[end] are wall-clock values in, or null to follow the
-     * device — null is not "no zone", it is "whichever zone the device is in
-     * when this is saved", which is what an event authored and lived in one
-     * place wants. The data layer resolves it at write time and always stamps a
-     * concrete `EVENT_TIMEZONE`.
-     *
-     * A non-null value pins the event to a zone regardless of where the device
-     * is, so it keeps tracking that zone's offset across DST. [toEditForm] only
-     * sets it when the stored zone differs from the device's, so merely opening
-     * a local event never reveals the field — and re-opening a pinned one in
-     * another zone round-trips it rather than silently re-anchoring it.
-     *
-     * Always null for all-day events: those are date-anchored, not zone-anchored
-     * (see [EventFormField.Timezone] and the data layer's UTC-midnight rule).
-     */
-    val timezone: String? = null,
     val location: String = "",
     val description: String = "",
     /** Reminder lead times in minutes before the start, deduplicated. */
@@ -84,19 +66,11 @@ data class EventAttendee(
 
 /**
  * The form's optional sections. Which ones show by default is a user setting;
- * the rest unfold behind a "more fields" button. Declaration order is the order
+ * the rest unfold behind a "more fields" button.
- * they're offered in, so a new constant goes where it belongs on the form, not
- * at the end.
  */
 enum class EventFormField {
     Location,
     Description,
-    /**
-     * Pins the event's wall-clock times to a zone. Offered right after the time
-     * fields it qualifies, and suppressed entirely for all-day events, whose
-     * dates are deliberately zone-free.
-     */
-    Timezone,
     Reminders,
     Recurrence,
     Availability,
@@ -126,25 +100,8 @@ enum class EventFormProblem {
  * All-day provider times are UTC midnights with an exclusive end; the form
  * shows the last covered day and keeps placeholder wall-clock times in case
  * the user switches the event to timed.
- *
- * A timed event stored in a zone other than [zone] is prefilled *in its own
- * zone* and keeps it pinned, so the wall-clock the form shows is the one the
- * event means ("the New York 09:00 call") and a later save re-anchors it to the
- * same zone rather than the device's.
  */
 fun EventDetail.toEditForm(beginMillis: Long, endMillis: Long, zone: TimeZone): EventForm {
-    // All-day events are date-anchored and carry a nominal "UTC" that is an
-    // anchor, not a location, so they never pin a zone.
-    val pinnedZone = if (instance.isAllDay) {
-        null
-    } else {
-        eventTimezone
-            ?.takeIf { it != zone.id }
-            // An unparseable id (a malformed sync row) can't be honoured or
-            // shown; fall back to the device zone rather than failing the open.
-            ?.takeIf { runCatching { TimeZone.of(it) }.isSuccess }
-    }
-    val formZone = pinnedZone?.let { TimeZone.of(it) } ?: zone
     val (start, end) = if (instance.isAllDay) {
         val startDate = Instant.fromEpochMilliseconds(beginMillis)
             .toLocalDateTime(TimeZone.UTC).date
@@ -153,8 +110,8 @@ fun EventDetail.toEditForm(beginMillis: Long, endMillis: Long, zone: TimeZone):
         val endDate = maxOf(startDate, LocalDate.fromEpochDays(endExclusive.toEpochDays() - 1))
         LocalDateTime(startDate, LocalTime(9, 0)) to LocalDateTime(endDate, LocalTime(10, 0))
     } else {
-        Instant.fromEpochMilliseconds(beginMillis).toLocalDateTime(formZone) to
+        Instant.fromEpochMilliseconds(beginMillis).toLocalDateTime(zone) to
-            Instant.fromEpochMilliseconds(endMillis).toLocalDateTime(formZone)
+            Instant.fromEpochMilliseconds(endMillis).toLocalDateTime(zone)
     }
     return EventForm(
         calendarId = instance.calendarId,
@@ -162,7 +119,6 @@ fun EventDetail.toEditForm(beginMillis: Long, endMillis: Long, zone: TimeZone):
         isAllDay = instance.isAllDay,
         start = start,
         end = end,
-        timezone = pinnedZone,
         location = instance.location.orEmpty(),
         description = description.orEmpty(),
         reminders = reminders.map { it.minutes }.distinct().sorted(),
@@ -220,23 +176,6 @@ fun EventDetail.toEditSnapshot(beginMillis: Long, endMillis: Long, zone: TimeZon
         rowEnd = instance.end,
     )
 
-/**
- * The form's times as they land in [target] — what a pinned event's wall-clock
- * actually means where the user is standing. Null when there's nothing to
- * disambiguate: an unpinned event (already in [target]), one pinned to [target]
- * itself, an all-day event (no zone), or an unparseable pinned zone.
- *
- * The form edits a pinned event in its own zone, so this is what lets the UI
- * show the other side of the pair rather than making the user do the arithmetic.
- */
-fun EventForm.timesIn(target: TimeZone): Pair<LocalDateTime, LocalDateTime>? {
-    if (isAllDay) return null
-    val pinned = timezone?.let { runCatching { TimeZone.of(it) }.getOrNull() } ?: return null
-    if (pinned.id == target.id) return null
-    return start.toInstant(pinned).toLocalDateTime(target) to
-        end.toInstant(pinned).toLocalDateTime(target)
-}
-
 /**
  * The optional sections that hold a value in [form] — when editing, these
  * must be visible regardless of the user's default-fields setting, or the
@@ -245,7 +184,6 @@ fun EventForm.timesIn(target: TimeZone): Pair<LocalDateTime, LocalDateTime>? {
 fun EventForm.populatedFields(): Set<EventFormField> = buildSet {
     if (location.isNotBlank()) add(EventFormField.Location)
     if (description.isNotBlank()) add(EventFormField.Description)
-    if (timezone != null) add(EventFormField.Timezone)
     if (reminders.isNotEmpty()) add(EventFormField.Reminders)
     if (rrule != null) add(EventFormField.Recurrence)
     if (availability != Availability.Busy) add(EventFormField.Availability)

app/src/main/java/de/jeanlucmakiola/calendula/domain/EventShift.kt

@@ -1,53 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.plus
-import kotlinx.datetime.toInstant
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Instant
-
-/**
- * The zone this form's wall-clock times mean, matching what the data layer
- * resolves them in at write time: the form's own pinned zone, else [deviceZone].
- */
-fun EventForm.resolvedZone(deviceZone: TimeZone): TimeZone =
-    timezone?.let { runCatching { TimeZone.of(it) }.getOrNull() } ?: deviceZone
-
-/**
- * The form moved so it starts at [newStart], keeping its **instant** duration —
- * a recurring event's length travels to the provider as `DURATION`, so keeping
- * wall clock instead would rewrite the series' length across a DST boundary.
- *
- * All-day events are date-anchored — use [shiftedByDays]; this returns them
- * untouched.
- */
-fun EventForm.shiftedTo(newStart: Instant, deviceZone: TimeZone): EventForm {
-    if (isAllDay) return this
-    val zone = resolvedZone(deviceZone)
-    val span = end.toInstant(zone) - start.toInstant(zone)
-    return copy(
-        start = newStart.toLocalDateTime(zone),
-        end = (newStart + span).toLocalDateTime(zone),
-    )
-}
-
-/**
- * The form moved [days] calendar days, keeping its time of day and its span.
- * All-day events are pure date arithmetic; a timed one preserves its **instant**
- * duration, for the same reason [shiftedTo] does.
- */
-fun EventForm.shiftedByDays(days: Int, deviceZone: TimeZone): EventForm {
-    if (days == 0) return this
-    val newStart = LocalDateTime(start.date.plus(days, DateTimeUnit.DAY), start.time)
-    if (isAllDay) {
-        return copy(
-            start = newStart,
-            end = LocalDateTime(end.date.plus(days, DateTimeUnit.DAY), end.time),
-        )
-    }
-    val zone = resolvedZone(deviceZone)
-    val span = end.toInstant(zone) - start.toInstant(zone)
-    return copy(start = newStart, end = (newStart.toInstant(zone) + span).toLocalDateTime(zone))
-}

app/src/main/java/de/jeanlucmakiola/calendula/domain/InsertEventForm.kt

@@ -15,9 +15,7 @@ import kotlin.time.Instant
  * calendar this way to create a new event, passing the fields as
  * [android.provider.CalendarContract] extras. Any field the intent omits falls
  * back to the same defaults the in-app "new event" uses — a timed start at the
- * next full hour, and a placeholder hour for a missing end that the form then
+ * next full hour and a one-hour duration. [EventForm.calendarId] is left null so
- * stretches to the default-duration setting (the intent is opened as
- * `ImportSource.InsertOpenEnded`, #54). [EventForm.calendarId] is left null so
  * it resolves to the last-used / first-writable calendar, exactly like the
  * `.ics` single-event and plain new-event paths.
  *

app/src/main/java/de/jeanlucmakiola/calendula/domain/Models.kt

@@ -1,9 +1,5 @@
 package de.jeanlucmakiola.calendula.domain
 
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Instant
 
 data class CalendarSource(
@@ -12,11 +8,6 @@ data class CalendarSource(
     val accountName: String,
     val accountType: String,
     val color: Int,
-    /**
-     * The system's `Calendars.VISIBLE` flag — the single visibility model,
-     * deciding both what Calendula shows and whether this calendar plans
-     * reminders (#75). The drawer's filter sheet is a separate in-app declutter.
-     */
     val isVisibleInSystem: Boolean,
     /**
      * Whether events in this calendar can be created/edited/deleted
@@ -43,13 +34,6 @@ data class CalendarSource(
      * even after a backup restore clears the app's stored ids.
      */
     val isManaged: Boolean = false,
-    /**
-     * Whether the provider keeps this calendar's events on the device
-     * (`Calendars.SYNC_EVENTS`), independent of [isVisibleInSystem]. Says
-     * nothing about device-local calendars, which can hold events with it off.
-     * Read for the "not synced" row label (#76).
-     */
-    val syncsEvents: Boolean = true,
 )
 
 data class EventInstance(
@@ -62,12 +46,6 @@ data class EventInstance(
     val isAllDay: Boolean,
     val color: Int,
     val location: String?,
-    /**
-     * Whether this row's event carries a recurrence rule. Only search results
-     * (which read the series master) fill this in — the Instances query already
-     * yields one row per occurrence, so it stays false there.
-     */
-    val isRecurring: Boolean = false,
 )
 
 /**
@@ -78,31 +56,6 @@ data class EventInstance(
  */
 fun EventInstance.hasEnded(now: Instant): Boolean = end <= now
 
-/**
- * The zone this event's calendar dates live in: the device [zone] for timed
- * events, UTC for all-day ones, whose midnights would otherwise shift day
- * boundaries (#65, #82). Every surface naming an all-day date goes through here.
- */
-fun EventInstance.dateZone(zone: TimeZone): TimeZone =
-    if (isAllDay) TimeZone.UTC else zone
-
-/** The first calendar day this event occupies. */
-fun EventInstance.spanFirstDay(zone: TimeZone): LocalDate =
-    start.toLocalDateTime(dateZone(zone)).date
-
-/**
- * The last calendar day this event occupies. An event ending exactly at midnight
- * does not reach into that day, so resolve just before [EventInstance.end].
- */
-fun EventInstance.spanLastDay(zone: TimeZone): LocalDate {
-    val lastInstant = if (end > start) end - 1.milliseconds else start
-    return lastInstant.toLocalDateTime(dateZone(zone)).date
-}
-
-/** Whether this event occupies more than one calendar day in [zone]. */
-fun EventInstance.spansMultipleDays(zone: TimeZone): Boolean =
-    spanFirstDay(zone) != spanLastDay(zone)
-
 data class EventDetail(
     val instance: EventInstance,
     val description: String?,
@@ -130,12 +83,6 @@ data class EventDetail(
     val eventColor: Int? = null,
     /** The event's `Events.EVENT_COLOR_KEY` (a calendar-palette key), or null. */
     val eventColorKey: String? = null,
-    /**
-     * True when this row is a modified occurrence of a series (`ORIGINAL_ID` is
-     * set) rather than a master, so a reschedule takes the plain whole-row path
-     * whatever [rrule] a sync adapter left on it.
-     */
-    val isException: Boolean = false,
 )
 
 /**

app/src/main/java/de/jeanlucmakiola/calendula/domain/Recurrence.kt

@@ -138,7 +138,7 @@ fun SimpleRecurrence.toRRule(zone: TimeZone = TimeZone.currentSystemDefault()):
     }
 }
 
-internal val RRULE_DAY_CODES: Map<DayOfWeek, String> = mapOf(
+private val RRULE_DAY_CODES: Map<DayOfWeek, String> = mapOf(
     DayOfWeek.MONDAY to "MO",
     DayOfWeek.TUESDAY to "TU",
     DayOfWeek.WEDNESDAY to "WE",

app/src/main/java/de/jeanlucmakiola/calendula/domain/RecurrenceOccurrences.kt

@@ -1,106 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.DayOfWeek
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.isoDayNumber
-import kotlinx.datetime.minus
-import kotlinx.datetime.number
-import kotlinx.datetime.plus
-
-/**
- * The first [limit] dates a [SimpleRecurrence] fires on, starting at [start]
- * (DTSTART), for previewing a rule as dates instead of as words. A preview only,
- * kept to the shapes the picker can build; the provider stays the authority.
- *
- * Mirrors RFC 5545: [start] is always the first occurrence (§3.8.5.3), even when
- * the rule's own picks miss it; a monthly or yearly rule *skips* a period the
- * start day doesn't exist in rather than clamping; a weekly rule repeats in
- * blocks of `interval` weeks beginning on Monday (the default WKST, since
- * [toRRule] never writes one); [RecurrenceEnd.Count] counts real occurrences and
- * [RecurrenceEnd.Until] is inclusive.
- *
- * Returns fewer than [limit] dates when the series ends first, and an empty list
- * only when the rule yields nothing at all (an UNTIL before [start]).
- */
-fun SimpleRecurrence.upcomingOccurrences(start: LocalDate, limit: Int): List<LocalDate> {
-    if (limit <= 0) return emptyList()
-    val until = (end as? RecurrenceEnd.Until)?.date
-    val maxCount = (end as? RecurrenceEnd.Count)?.times ?: Int.MAX_VALUE
-    val wanted = minOf(limit, maxCount)
-    if (wanted <= 0) return emptyList()
-    if (until != null && start > until) return emptyList()
-
-    // DTSTART is in the recurrence set whatever the rule picks, so seed with it
-    // and let the walk skip anything landing on or before it.
-    val result = mutableListOf(start)
-    var period = 0
-    // Periods can yield nothing (a skipped 31st), so the cap counts periods
-    // examined rather than dates found.
-    while (result.size < wanted && period < MAX_PERIODS) {
-        for (date in occurrencesInPeriod(period, start)) {
-            if (date <= start) continue
-            if (until != null && date > until) return result
-            result += date
-            if (result.size == wanted) return result
-        }
-        period++
-    }
-    return result
-}
-
-/** The dates this rule's [period]-th repetition yields (empty when skipped). */
-private fun SimpleRecurrence.occurrencesInPeriod(period: Int, start: LocalDate): List<LocalDate> =
-    when (freq) {
-        RecurrenceFreq.Daily -> listOf(start.plus(period * interval, DateTimeUnit.DAY))
-        RecurrenceFreq.Weekly -> weeklyOccurrences(period, start)
-        RecurrenceFreq.Monthly -> {
-            val month = start.plus(period * interval, DateTimeUnit.MONTH)
-            // plus() clamps into the shorter month, but the rule skips such a
-            // period — so a clamped date means "not this month".
-            listOfNotNull(dateOrNull(month.year, month.month.number, start.day))
-        }
-        RecurrenceFreq.Yearly ->
-            listOfNotNull(dateOrNull(start.year + period * interval, start.month.number, start.day))
-    }
-
-/**
- * One weekly block: every picked weekday inside the week that begins
- * `period * interval` weeks after the start's own week, in weekday order. With
- * no picks the rule simply repeats the start's weekday.
- */
-private fun SimpleRecurrence.weeklyOccurrences(period: Int, start: LocalDate): List<LocalDate> {
-    if (byDays.isEmpty()) return listOf(start.plus(period * interval, DateTimeUnit.WEEK))
-    val daysIntoWeek = (start.dayOfWeek.isoDayNumber - DayOfWeek.MONDAY.isoDayNumber + DAYS_PER_WEEK) %
-        DAYS_PER_WEEK
-    val weekStart = start
-        .minus(daysIntoWeek, DateTimeUnit.DAY)
-        .plus(period * interval, DateTimeUnit.WEEK)
-    return byDays.sortedBy { it.isoDayNumber }.map { day ->
-        weekStart.plus(
-            (day.isoDayNumber - DayOfWeek.MONDAY.isoDayNumber + DAYS_PER_WEEK) % DAYS_PER_WEEK,
-            DateTimeUnit.DAY,
-        )
-    }
-}
-
-/**
- * Whether a run of [occurrences] starting at [start] leaves its starting year,
- * i.e. whether showing them without a year would be ambiguous — a yearly rule
- * would otherwise read as the same date repeated.
- */
-fun occurrencesSpanYears(occurrences: List<LocalDate>, start: LocalDate): Boolean =
-    occurrences.any { it.year != start.year } || occurrences.map { it.year }.distinct().size > 1
-
-/** [LocalDate] for a day-of-month that may not exist in that month; null if it doesn't. */
-private fun dateOrNull(year: Int, month: Int, day: Int): LocalDate? =
-    runCatching { LocalDate(year, month, day) }.getOrNull()
-
-private const val DAYS_PER_WEEK = 7
-
-/**
- * How many repetitions to examine before giving up: generous enough for the
- * sparsest rule the picker can build, bounded so a rule whose occurrences all
- * fall outside its own UNTIL can't spin.
- */
-private const val MAX_PERIODS = 2_000

app/src/main/java/de/jeanlucmakiola/calendula/domain/RecurrenceRealign.kt

@@ -1,48 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-import kotlinx.datetime.LocalDate
-
-/**
- * [rrule] re-anchored from an occurrence on [oldStart] to one on [newStart].
- *
- * `Events.RRULE` is written verbatim while DTSTART moves, so `FREQ=WEEKLY;BYDAY=MO`
- * would keep naming Monday after the anchor became a Wednesday and the series
- * would not move at all — `BYDAY` is re-derived from [newStart].
- *
- * Only weekly `BYDAY` is realigned, and only for a whole-day move: the rule has
- * to agree with the series *anchor*, and weekday arithmetic is the only kind
- * that survives the same wall-clock shift unchanged. Everything else returns
- * null, as do rules one moved occurrence can't resolve (`BYDAY=MO,WE`, `2TH`,
- * `BYSETPOS`). The accepted parts are a subset of [parseSimpleRecurrence], so
- * anything realignable is also a rule [problems] can check the `UNTIL` of.
- */
-fun realignRecurrence(rrule: String, oldStart: LocalDate, newStart: LocalDate): String? {
-    if (oldStart == newStart) return rrule
-    val prefix = if (rrule.startsWith("RRULE:")) "RRULE:" else ""
-    val parts = rrule.removePrefix("RRULE:").split(';').filter { it.isNotBlank() }
-    if (parts.isEmpty()) return null
-    var weekly = false
-    val rebuilt = parts.map { part ->
-        val eq = part.indexOf('=')
-        if (eq <= 0) return null
-        val key = part.substring(0, eq).uppercase()
-        val value = part.substring(eq + 1).trim()
-        when (key) {
-            "FREQ" -> {
-                weekly = value.equals("WEEKLY", ignoreCase = true)
-                part
-            }
-            "BYDAY" -> {
-                val old = RRULE_DAY_CODES[oldStart.dayOfWeek] ?: return null
-                if (!value.equals(old, ignoreCase = true)) return null
-                "BYDAY=${RRULE_DAY_CODES.getValue(newStart.dayOfWeek)}"
-            }
-            "INTERVAL", "COUNT", "UNTIL", "WKST" -> part
-            else -> return null
-        }
-    }
-    // BYDAY is only simple on a weekly rule, matching parseSimpleRecurrence.
-    if (!weekly && parts.any { it.substringBefore('=').trim().uppercase() == "BYDAY" }) return null
-    if (parts.none { it.substringBefore('=').trim().uppercase() == "FREQ" }) return null
-    return prefix + rebuilt.joinToString(";")
-}

app/src/main/java/de/jeanlucmakiola/calendula/domain/TimeZoneCatalog.kt

@@ -1,225 +0,0 @@
-package de.jeanlucmakiola.calendula.domain
-
-import java.text.Normalizer
-import java.time.Instant
-import java.time.ZoneId
-import java.time.format.TextStyle
-import java.util.Locale
-
-/**
- * One selectable zone, resolved for display at a given instant. [id] is the IANA
- * id we store in `EVENT_TIMEZONE` and show as the primary label (via [label]);
- * [shortName] its abbreviation ("CET", "WET", "UTC", or a "GMT+05:30" fallback);
- * [offsetMinutes] its offset. Both the abbreviation and the offset shift with
- * DST, so they're only meaningful next to the moment they were resolved for.
- *
- * [displayName] is the long localized name ("Central European Time"). It's kept
- * for search only — matching on it lets someone type "pacific" — and is *not*
- * displayed: spelled out next to the id it made the field too wide to fit.
- */
-data class TimeZoneOption(
-    val id: String,
-    val displayName: String,
-    val shortName: String,
-    val offsetMinutes: Int,
-) {
-    /** The id as the primary label, underscores undone ("America/New York"). */
-    val label: String get() = id.replace('_', ' ')
-
-    /** The trailing segment of the id ("Europe/Berlin" -> "Berlin"), underscores undone. */
-    val city: String get() = id.substringAfterLast('/').replace('_', ' ')
-
-    /** The leading segment ("Europe/Berlin" -> "Europe"); empty for bare ids like "UTC". */
-    val region: String get() = id.substringBeforeLast('/', missingDelimiterValue = "")
-
-    /**
-     * The four fields [filterTimeZones] matches on, normalized once here rather
-     * than per query. Normalizing is not cheap — NFD decomposition plus a combining-
-     * mark strip — and a search re-examines every option on every keystroke, so
-     * doing it at construction turns ~2400 normalizations per character into a few
-     * hundred plain `startsWith`/`contains` calls.
-     *
-     * Declared in the class body, so it stays out of `equals`/`hashCode`/`copy`:
-     * it is derived state, and two options with the same id are the same option.
-     */
-    internal val searchKeys: TimeZoneSearchKeys = TimeZoneSearchKeys(
-        city = city.normalizeForSearch(),
-        id = id.normalizeForSearch(),
-        displayName = displayName.normalizeForSearch(),
-        shortName = shortName.normalizeForSearch(),
-    )
-}
-
-/** Pre-normalized match targets for one [TimeZoneOption]. */
-internal data class TimeZoneSearchKeys(
-    val city: String,
-    val id: String,
-    val displayName: String,
-    val shortName: String,
-)
-
-private fun optionFor(
-    zone: ZoneId,
-    locale: Locale,
-    at: Instant,
-    regionOf: (String) -> String?,
-): TimeZoneOption = TimeZoneOption(
-    id = zone.id,
-    displayName = zone.getDisplayName(TextStyle.FULL, locale),
-    shortName = resolveAbbreviation(zone.id, zone.rules.isDaylightSavings(at), locale, regionOf),
-    offsetMinutes = zone.rules.getOffset(at).totalSeconds / 60,
-)
-
-/**
- * The zone abbreviation ("EDT", "CEST"), DST-correct at the resolved instant, or
- * a "GMT+05:30" form when no name exists.
- *
- * Two things make this fiddlier than it looks. First, it goes through
- * java.util.TimeZone, NOT java.time's "zzz" formatter: on Android the latter has
- * no short specific-zone names and degrades every zone to a "GMT-4" form (it
- * agrees with java.util only on desktop, which is why desktop can't catch it).
- * Second, ICU only surfaces the short name *commonly used in the display
- * locale's region* — a German-region English phone (en-DE) is shown "CEST" but
- * not "EDT", and an en-US phone the reverse. So ask in the display *language*
- * but the *zone's* region ("America/New_York" in en-US, "Europe/Berlin" in
- * en-DE) via [regionOf]. That covers almost everything; where a region still
- * yields no name (Athens in en-GR) the plain device locale sometimes does, so
- * try that next; failing both, the caller shows the offset.
- *
- * [regionOf] maps an IANA id to an ISO 3166 region and is injected because it
- * needs `android.icu`, which this pure-JVM module can't import. The default
- * (no region) leaves only the device-locale path — which is all a JVM test has
- * anyway, and enough there since desktop ICU isn't region-gated the same way.
- */
-private fun resolveAbbreviation(
-    id: String,
-    dst: Boolean,
-    locale: Locale,
-    regionOf: (String) -> String?,
-): String {
-    fun shortIn(loc: Locale): String =
-        java.util.TimeZone.getTimeZone(id).getDisplayName(dst, java.util.TimeZone.SHORT, loc)
-    val regional = regionOf(id)
-        ?.takeIf { it.length == 2 }
-        ?.let { shortIn(Locale(locale.language, it)) }
-    if (regional != null && !regional.looksLikeOffset()) return regional
-    // Either no region, or the region has no name for this zone: the device
-    // locale is the next-best shot, and the offset the last resort.
-    return shortIn(locale)
-}
-
-/** True for the offset-style names ICU returns when a zone has no abbreviation. */
-private fun String.looksLikeOffset(): Boolean = this == "UTC" || startsWith("GMT")
-
-/**
- * Every zone the JVM knows, resolved at [at]. [regionOf] (see
- * [resolveAbbreviation]) supplies the zone's region for the abbreviation.
- *
- * This is ~600 entries, each costing a localized display name plus up to two ICU
- * short-name lookups, so it is **not** cheap enough for the main thread — build
- * it off-thread once and filter the result with [filterTimeZones] rather than
- * rebuilding per keystroke.
- *
- * Bare three-letter ids ("EST", "CST6CDT") and the legacy SystemV tree are
- * dropped: they're aliases the tz database keeps for compatibility, they'd
- * double up the real zones in the list, and none of them is what a user means
- * when they pick a place.
- */
-fun timeZoneOptions(
-    locale: Locale = Locale.getDefault(),
-    at: Instant = Instant.now(),
-    regionOf: (String) -> String? = { null },
-): List<TimeZoneOption> = ZoneId.getAvailableZoneIds()
-    .asSequence()
-    .filter { it.contains('/') && !it.startsWith("SystemV/") }
-    .map { optionFor(ZoneId.of(it), locale, at, regionOf) }
-    .sortedWith(compareBy({ it.region }, { it.city }))
-    .toList()
-
-/**
- * Resolve a single [id] the same way [timeZoneOptions] would, or null if the tz
- * database doesn't know it — for labelling one known zone without paying to
- * build the whole catalogue.
- */
-fun timeZoneOptionOf(
-    id: String,
-    locale: Locale = Locale.getDefault(),
-    at: Instant = Instant.now(),
-    regionOf: (String) -> String? = { null },
-): TimeZoneOption? {
-    val zone = runCatching { ZoneId.of(id) }.getOrNull() ?: return null
-    return optionFor(zone, locale, at, regionOf)
-}
-
-/**
- * The short descriptor shown beneath the id, e.g. "CET · GMT+01:00". "UTC" reads
- * fine alone; any other offset-shaped name is normalised to our own GMT form so
- * the offset isn't stated twice in ICU's spelling and ours.
- */
-fun zoneDescriptor(option: TimeZoneOption): String {
-    val abbrev = option.shortName
-    return when {
-        abbrev == "UTC" -> "UTC"
-        abbrev.startsWith("GMT") -> formatGmtOffset(option.offsetMinutes)
-        else -> "$abbrev · ${formatGmtOffset(option.offsetMinutes)}"
-    }
-}
-
-/**
- * [options] matching [query], best matches first; a blank query returns the list
- * unchanged. Matching is accent- and case-insensitive and treats underscores as
- * spaces, so "sao paulo" finds "America/Sao_Paulo".
- *
- * Ranking puts a city that *starts with* the query above one that merely
- * contains it — typing "col" should reach Colombo before Turks_and_Caicos —
- * and the id is matched ahead of the localized name so a user who knows the
- * IANA id gets it first. An exact abbreviation hit ("CEST") ranks just under a
- * city prefix, so typing an abbreviation surfaces every zone that shows it
- * (all the CEST zones together); the abbreviation is the one resolved for the
- * display region, i.e. what the row actually shows.
- */
-fun filterTimeZones(options: List<TimeZoneOption>, query: String): List<TimeZoneOption> {
-    val needle = query.normalizeForSearch()
-    if (needle.isEmpty()) return options
-    return options
-        .mapNotNull { option ->
-            val keys = option.searchKeys
-            val rank = when {
-                keys.city.startsWith(needle) -> 0
-                keys.shortName == needle -> 1
-                keys.displayName.startsWith(needle) -> 2
-                keys.shortName.startsWith(needle) -> 3
-                keys.city.contains(needle) -> 4
-                keys.id.contains(needle) -> 5
-                keys.displayName.contains(needle) -> 6
-                else -> return@mapNotNull null
-            }
-            rank to option
-        }
-        .sortedWith(compareBy({ it.first }, { it.second.city }))
-        .map { it.second }
-}
-
-/** Unicode combining marks — what NFD decomposition leaves an accent as. */
-private val COMBINING_MARKS = Regex("\\p{Mn}+")
-
-/**
- * Lowercased, accent-stripped, underscores and slashes flattened to spaces, so
- * a query types the way a place is spoken rather than the way the tz database
- * spells it.
- */
-private fun String.normalizeForSearch(): String =
-    Normalizer.normalize(this, Normalizer.Form.NFD)
-        .replace(COMBINING_MARKS, "")
-        .replace('_', ' ')
-        .replace('/', ' ')
-        .lowercase(Locale.ROOT)
-        .trim()
-
-/** "GMT+02:00" / "GMT-05:30" / "GMT" — the offset as shown next to a zone. */
-fun formatGmtOffset(offsetMinutes: Int): String {
-    if (offsetMinutes == 0) return "GMT"
-    val sign = if (offsetMinutes < 0) '-' else '+'
-    val abs = kotlin.math.abs(offsetMinutes)
-    return "GMT%c%02d:%02d".format(sign, abs / 60, abs % 60)
-}

app/src/main/java/de/jeanlucmakiola/calendula/domain/color/EventTone.kt

@@ -1,124 +0,0 @@
-package de.jeanlucmakiola.calendula.domain.color
-
-/**
- * The colours one calendar's identity resolves to in one theme.
- *
- * The app paints a calendar's colour in two structurally different places, and
- * they want opposite things:
- *
- *  - a **[container]** sits behind text (week and day blocks, month bars, widget
- *    rows, picker swatches), so it has to contrast with its own ink;
- *  - an **[accent]** is a mark on an ordinary app surface (day dots, agenda and
- *    search stripes, calendar icon tints, the detail header), so it has to
- *    contrast with the *surface* instead.
- *
- * Painting both from one colour is what made this hard to get right: deep enough
- * to carry white text is too dark to see as a dot on a dark surface, and light
- * enough to show up there is too pale to carry white text. Splitting them lets
- * each be pinned to the lightness its job needs, while hue and chroma — the parts
- * that actually say *which calendar this is* — stay shared, so the two roles
- * still read as the same colour.
- */
-data class EventTone(
-    val container: Int,
-    val onContainer: Int,
-    val accent: Int,
-)
-
-/**
- * Resolve [rawArgb] for the current theme.
- *
- * With [harmonise] on, hue and chroma are kept and lightness is re-pinned per
- * role, which is what makes the ink predictable: every container lands at the
- * same perceptual lightness, so one ink colour serves every hue at ≥ 6:1. With
- * it off the provider's colour is painted verbatim — the sync source's own look,
- * as DAVx5/CalDAV users expect — and the ink is then chosen per colour, since
- * nothing constrains what the provider sends.
- */
-fun eventTone(rawArgb: Int, dark: Boolean, harmonise: Boolean): EventTone {
-    val opaque = rawArgb or 0xFF000000.toInt()
-    val raw = oklchOf(opaque)
-    if (!harmonise) {
-        return EventTone(
-            container = opaque,
-            onContainer = inkFor(raw.lightness),
-            accent = opaque,
-        )
-    }
-    // A near-grey source has no hue worth keeping, so it stays grey rather than
-    // being pushed to an arbitrary one; everything else is held inside a band
-    // that keeps calendars apart without going neon.
-    val chroma = if (raw.chroma < GREY_CHROMA) 0f else raw.chroma.coerceIn(MIN_CHROMA, MAX_CHROMA)
-    // Two poles rather than one. Forcing every hue deep is what turned the warm,
-    // naturally light ones muddy — a dark orange is brown and a dark yellow is
-    // olive, which is a fact about those hues, not a tuning miss. So a colour is
-    // sent to whichever pole it already sits nearer: most land deep and carry
-    // white ink, while genuinely light sources (yellows, creams, pale tints)
-    // stay light and carry dark ink, keeping the character that made them
-    // recognisable. Either way the colour is pulled clear of the middle, where
-    // neither ink reads well — which was the original fault.
-    val staysLight = raw.lightness >= LIGHT_POLE_THRESHOLD
-    val containerLightness = when {
-        staysLight && dark -> LIGHT_CONTAINER_LIGHTNESS_DARK
-        staysLight -> LIGHT_CONTAINER_LIGHTNESS_LIGHT
-        dark -> CONTAINER_LIGHTNESS_DARK
-        else -> CONTAINER_LIGHTNESS_LIGHT
-    }
-    // The accent takes no pole: it is a mark on the app's surface, so it has to
-    // contrast with that surface whichever way its container went.
-    val accentLightness = if (dark) ACCENT_LIGHTNESS_DARK else ACCENT_LIGHTNESS_LIGHT
-    return EventTone(
-        container = Oklch(containerLightness, chroma, raw.hue).toArgb(),
-        onContainer = inkFor(containerLightness),
-        accent = Oklch(accentLightness, chroma, raw.hue).toArgb(),
-    )
-}
-
-/**
- * White or black ink for a background of the given perceptual [lightness].
- *
- * Derived rather than hardcoded so it stays right for raw provider colours,
- * where lightness is whatever the sync source sent. For harmonised containers it
- * is constant by construction — that is the point of pinning the lightness.
- */
-fun inkFor(lightness: Float): Int =
-    if (lightness < INK_FLIP_LIGHTNESS) 0xFFFFFFFF.toInt() else 0xFF000000.toInt()
-
-/**
- * Lightness at which white ink overtakes black. Sits above the midpoint because
- * lightness is perceptual: a colour has to be distinctly light before black wins.
- */
-const val INK_FLIP_LIGHTNESS = 0.62f
-
-/**
- * Raw lightness at or above which a colour keeps its light character instead of
- * being pushed deep. Set high enough that oranges and warm reds still go deep —
- * a burnt orange reads as orange, where a dark yellow does not read as yellow —
- * so only the genuinely pale sources take the light pole.
- */
-const val LIGHT_POLE_THRESHOLD = 0.72f
-
-/** Container lightness: deep enough that white ink clears 5.5:1 on every hue. */
-const val CONTAINER_LIGHTNESS_LIGHT = 0.45f
-
-/** Same in dark mode, a shade lighter so a block separates from the surface. */
-const val CONTAINER_LIGHTNESS_DARK = 0.48f
-
-/** Light-pole container: pale enough that dark ink clears 11:1 on every hue. */
-const val LIGHT_CONTAINER_LIGHTNESS_LIGHT = 0.88f
-
-/** Same in dark mode, held down a little so a pale block doesn't glare. */
-const val LIGHT_CONTAINER_LIGHTNESS_DARK = 0.84f
-
-/** Accent lightness: dark enough to read as a mark on a pale surface. */
-const val ACCENT_LIGHTNESS_LIGHT = 0.55f
-
-/** Same against a dark surface, where the mark has to be the light one. */
-const val ACCENT_LIGHTNESS_DARK = 0.78f
-
-/** Below this chroma a colour counts as grey and keeps no hue. */
-const val GREY_CHROMA = 0.02f
-
-/** Chroma band for harmonised colours: distinct, but never electric. */
-const val MIN_CHROMA = 0.07f
-const val MAX_CHROMA = 0.16f

app/src/main/java/de/jeanlucmakiola/calendula/domain/color/Oklch.kt

@@ -1,119 +0,0 @@
-package de.jeanlucmakiola.calendula.domain.color
-
-import kotlin.math.atan2
-import kotlin.math.cbrt
-import kotlin.math.cos
-import kotlin.math.hypot
-import kotlin.math.pow
-import kotlin.math.sin
-import kotlin.math.sqrt
-
-/**
- * A colour in Oklch — Oklab's cylindrical form: perceptual [lightness], [chroma]
- * (colourfulness) and [hue] in degrees.
- *
- * The point of using it over HSV is that its lightness axis matches what the eye
- * calls brightness. HSV's "value" does not: at a single pinned value the hues
- * spread across relative luminance 0.10 (indigo) to 0.45 (yellow), which is why
- * pinning value produced fills that needed different ink per hue. Pin Oklch
- * lightness instead and every hue lands at the same apparent brightness, so one
- * ink serves all of them.
- *
- * [lightness] runs 0 (black) to 1 (white); [chroma] is 0 (grey) to about 0.32 at
- * the sRGB limit.
- */
-data class Oklch(val lightness: Float, val chroma: Float, val hue: Float) {
-
-    /**
-     * Perceptual distance to [other] — plain Euclidean in Oklab, which is what
-     * Oklab is built for (unlike CIE Lab, where CIE76 is known to misjudge
-     * saturated blues).
-     */
-    fun distanceTo(other: Oklch): Float {
-        val (a1, b1) = chroma * cosDeg(hue) to chroma * sinDeg(hue)
-        val (a2, b2) = other.chroma * cosDeg(other.hue) to other.chroma * sinDeg(other.hue)
-        val dl = (lightness - other.lightness).toDouble()
-        return sqrt(dl * dl + (a1 - a2).pow(2) + (b1 - b2).pow(2)).toFloat()
-    }
-}
-
-/** Read [argb]'s opaque colour as Oklch. */
-fun oklchOf(argb: Int): Oklch {
-    val r = toLinear(((argb shr 16) and 0xFF) / 255.0)
-    val g = toLinear(((argb shr 8) and 0xFF) / 255.0)
-    val b = toLinear((argb and 0xFF) / 255.0)
-
-    val l = cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
-    val m = cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
-    val s = cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
-
-    val lightness = 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * s
-    val aAxis = 1.9779984951 * l - 2.4285922050 * m + 0.4505937099 * s
-    val bAxis = 0.0259040371 * l + 0.7827717662 * m - 0.8086757660 * s
-
-    val hue = (Math.toDegrees(atan2(bAxis, aAxis)) + 360.0) % 360.0
-    return Oklch(lightness.toFloat(), hypot(aAxis, bAxis).toFloat(), hue.toFloat())
-}
-
-/**
- * The opaque sRGB colour for this Oklch, gamut-mapped: most of the Oklch cylinder
- * falls outside sRGB, so a colour that does not fit keeps its lightness and hue
- * and gives up chroma until it does. Holding lightness is what matters here —
- * it's the axis the contrast guarantees rest on.
- */
-fun Oklch.toArgb(): Int {
-    val fitted = if (inSrgb(lightness, chroma, hue)) {
-        chroma
-    } else {
-        var low = 0f
-        var high = chroma
-        repeat(GAMUT_STEPS) {
-            val mid = (low + high) / 2f
-            if (inSrgb(lightness, mid, hue)) low = mid else high = mid
-        }
-        low
-    }
-    val (r, g, b) = linearSrgbOf(lightness, fitted, hue)
-    return 0xFF shl 24 or
-        (channel(r) shl 16) or
-        (channel(g) shl 8) or
-        channel(b)
-}
-
-private fun linearSrgbOf(lightness: Float, chroma: Float, hue: Float): Triple<Double, Double, Double> {
-    val a = chroma * cosDeg(hue)
-    val b = chroma * sinDeg(hue)
-    val l = (lightness + 0.3963377774 * a + 0.2158037573 * b).pow(3)
-    val m = (lightness - 0.1055613458 * a - 0.0638541728 * b).pow(3)
-    val s = (lightness - 0.0894841775 * a - 1.2914855480 * b).pow(3)
-    return Triple(
-        4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
-        -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
-        -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s,
-    )
-}
-
-private fun inSrgb(lightness: Float, chroma: Float, hue: Float): Boolean {
-    val (r, g, b) = linearSrgbOf(lightness, chroma, hue)
-    return r in -GAMUT_EPSILON..(1.0 + GAMUT_EPSILON) &&
-        g in -GAMUT_EPSILON..(1.0 + GAMUT_EPSILON) &&
-        b in -GAMUT_EPSILON..(1.0 + GAMUT_EPSILON)
-}
-
-private fun channel(linear: Double): Int =
-    (toSrgb(linear.coerceIn(0.0, 1.0)) * 255.0).toInt().coerceIn(0, 255)
-
-private fun toLinear(c: Double): Double =
-    if (c <= 0.04045) c / 12.92 else ((c + 0.055) / 1.055).pow(2.4)
-
-private fun toSrgb(c: Double): Double =
-    if (c <= 0.0031308) 12.92 * c else 1.055 * c.pow(1.0 / 2.4) - 0.055
-
-private fun cosDeg(deg: Float) = cos(Math.toRadians(deg.toDouble()))
-private fun sinDeg(deg: Float) = sin(Math.toRadians(deg.toDouble()))
-
-/** Bisection steps when pulling an out-of-gamut colour back into sRGB. */
-private const val GAMUT_STEPS = 24
-
-/** Slack for the gamut test, so rounding at the boundary doesn't reject a fit. */
-private const val GAMUT_EPSILON = 1e-4

app/src/main/java/de/jeanlucmakiola/calendula/domain/reminders/ReminderPlan.kt

@@ -1,191 +0,0 @@
-package de.jeanlucmakiola.calendula.domain.reminders
-
-import java.time.Instant
-import java.time.LocalDate
-import java.time.LocalTime
-import java.time.ZoneId
-import java.time.ZoneOffset
-import java.time.temporal.ChronoUnit
-
-/**
- * Pure decision layer of in-house reminder delivery (#75): instances and reminder
- * offsets in, fire instants out. No provider, no clock. See docs/ARCHITECTURE.md.
- */
-
-/** An occurrence that reminders can hang off, flattened out of `Instances`. */
-data class ReminderEventInstance(
-    val eventId: Long,
-    val calendarId: Long,
-    val beginMillis: Long,
-    val endMillis: Long,
-    val title: String,
-    val location: String?,
-    val isAllDay: Boolean,
-)
-
-/**
- * One occurrence paired with one of its reminder offsets, and the instant that
- * pairing has to fire at.
- */
-data class PlannedReminder(
-    val instance: ReminderEventInstance,
-    val minutes: Int,
-    val alarmMillis: Long,
-) {
-    /**
-     * Stable identity, keying the notification tag and the snooze/dismiss
-     * `PendingIntent`s. Survives reboot, re-scan and reinstall.
-     */
-    val key: Long = key(instance.eventId, instance.beginMillis, minutes)
-
-    private companion object {
-        fun key(eventId: Long, beginMillis: Long, minutes: Int): Long {
-            var h = eventId * 1_000_003L
-            h = (h xor beginMillis) * 31L
-            return h + minutes
-        }
-    }
-}
-
-/** What one scan concluded: post these now, and wake up again at [nextAlarmMillis]. */
-data class ReminderSchedule(
-    val due: List<PlannedReminder>,
-    val nextAlarmMillis: Long,
-)
-
-private const val MILLIS_PER_MINUTE = 60_000L
-private const val MINUTES_PER_DAY = 1_440
-
-/**
- * Pair every instance with each of its event's reminder offsets.
- *
- * Timed occurrences fire at `begin − minutes`. All-day ones read the offset only
- * for *which day* it means ([allDayLeadDays]) and take the hour from
- * [allDayTimeMinutes], recomposed against each occurrence's own date in [zone].
- * Duplicate offsets in [minutesByEvent] collapse.
- */
-fun planReminders(
-    instances: List<ReminderEventInstance>,
-    minutesByEvent: Map<Long, List<Int>>,
-    zone: ZoneId,
-    allDayTimeMinutes: Int,
-): List<PlannedReminder> = instances.flatMap { instance ->
-    minutesByEvent[instance.eventId].orEmpty().distinct().map { minutes ->
-        PlannedReminder(
-            instance = instance,
-            minutes = minutes,
-            alarmMillis = if (instance.isAllDay) {
-                allDayAlarmMillis(instance.beginMillis, minutes, zone, allDayTimeMinutes)
-            } else {
-                instance.beginMillis - minutes * MILLIS_PER_MINUTE
-            },
-        )
-    }
-}
-
-/** UTC midnight of an all-day occurrence, as the calendar date it stands for. */
-private fun allDayDate(beginMillis: Long): LocalDate =
-    Instant.ofEpochMilli(beginMillis).atZone(ZoneOffset.UTC).toLocalDate()
-
-/**
- * How many whole days before its occurrence a raw all-day offset means.
- *
- * Our own rows fold the wanted hour into the offset, so the local date of the
- * encoded instant is the answer. A plain multiple of 1440 is a foreign bare lead
- * time and taken at face value instead — unless the instant lands on the hour the
- * setting names (within [NAMED_HOUR_TOLERANCE_MINUTES], for DST drift), where the
- * encodings collide and the tie goes to our own reading.
- *
- * Also used by
- * [de.jeanlucmakiola.calendula.data.calendar.fromProviderAllDayMinutes] for
- * display, so screen and notification agree.
- */
-internal fun allDayLeadDays(
-    rawMinutes: Int,
-    startDate: LocalDate,
-    zone: ZoneId,
-    allDayTimeMinutes: Int,
-): Long {
-    val utcMidnight = startDate.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli()
-    val encoded = Instant.ofEpochMilli(utcMidnight - rawMinutes * MILLIS_PER_MINUTE).atZone(zone)
-    val minutesFromNamedHour = encoded.toLocalTime().let {
-        val delta = (it.hour * 60 + it.minute - allDayTimeMinutes).mod(MINUTES_PER_DAY)
-        minOf(delta, MINUTES_PER_DAY - delta)
-    }
-    if (rawMinutes % MINUTES_PER_DAY == 0 && minutesFromNamedHour > NAMED_HOUR_TOLERANCE_MINUTES) {
-        return (rawMinutes / MINUTES_PER_DAY).toLong()
-    }
-    return ChronoUnit.DAYS.between(encoded.toLocalDate(), startDate)
-}
-
-/** DST drift a row written in the other phase carries, rounded up past Lord Howe's half hour. */
-private const val NAMED_HOUR_TOLERANCE_MINUTES = 90
-
-private fun allDayAlarmMillis(
-    beginMillis: Long,
-    rawMinutes: Int,
-    zone: ZoneId,
-    allDayTimeMinutes: Int,
-): Long = allDayDate(beginMillis)
-    .minusDays(allDayLeadDays(rawMinutes, allDayDate(beginMillis), zone, allDayTimeMinutes))
-    .atTime(LocalTime.of(allDayTimeMinutes / 60, allDayTimeMinutes % 60))
-    .atZone(zone)
-    .toInstant()
-    .toEpochMilli()
-
-/**
- * Split [planned] into what is due now and when to wake up next.
- *
- * Due means the fire instant falls in `(lastFiredMillis, nowMillis]`, so a scan
- * running twice cannot post twice while a late one still catches up. Reminders
- * whose event has ended are dropped ([isStillRelevant]). [nextAlarmMillis] is
- * capped at [horizonMillis] so the lookahead window keeps rolling forward.
- */
-fun scheduleReminders(
-    planned: List<PlannedReminder>,
-    lastFiredMillis: Long,
-    nowMillis: Long,
-    horizonMillis: Long,
-): ReminderSchedule {
-    val due = planned
-        .filter { it.alarmMillis in (lastFiredMillis + 1)..nowMillis }
-        .filter { it.instance.isStillRelevant(nowMillis) }
-        .distinctBy { it.key }
-        .sortedWith(compareBy({ it.instance.beginMillis }, { it.key }))
-    val nextPending = planned
-        .filter { it.alarmMillis > nowMillis }
-        .minOfOrNull { it.alarmMillis }
-    return ReminderSchedule(
-        due = due,
-        nextAlarmMillis = minOf(nextPending ?: horizonMillis, horizonMillis),
-    )
-}
-
-/**
- * Still worth showing while the occurrence has not ended. Falls back to the
- * begin time when the end is unknown (0L).
- */
-fun ReminderEventInstance.isStillRelevant(nowMillis: Long): Boolean =
-    (endMillis.takeIf { it > 0L } ?: beginMillis) >= nowMillis
-
-/**
- * The watermark a scan at [nowMillis] should measure against. A first-ever scan
- * claims the present rather than replaying everything since the epoch; a
- * watermark in the future (clock moved back) is clamped so it can't silence
- * every reminder until real time catches up.
- */
-fun reminderWatermark(lastScanMillis: Long?, nowMillis: Long): Long =
-    lastScanMillis?.coerceAtMost(nowMillis) ?: nowMillis
-
-/**
- * How far ahead instances must be queried: the plain lookahead plus the longest
- * reminder offset, so a "two weeks before" is planned before it comes due. The
- * stretch is capped at [MAX_REMINDER_LEAD_MILLIS] — `maxReminderMinutes` is the
- * largest row in the whole provider, and a nonsense one would otherwise make
- * every scan expand every series over years.
- */
-fun reminderQueryHorizon(lookaheadMillis: Long, maxReminderMinutes: Int): Long =
-    lookaheadMillis + (maxReminderMinutes * MILLIS_PER_MINUTE).coerceIn(0L, MAX_REMINDER_LEAD_MILLIS)
-
-/** Longest reminder offset a scan stretches its query window for — one year. */
-const val MAX_REMINDER_LEAD_MILLIS = 365L * 24 * 60 * 60 * 1000

app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt

@@ -10,7 +10,6 @@ import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -24,14 +23,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.domain.EventForm
 import de.jeanlucmakiola.calendula.domain.EventInstance
 import de.jeanlucmakiola.calendula.ui.agenda.AgendaScreen
-import de.jeanlucmakiola.calendula.ui.calendars.BackupScreen
 import de.jeanlucmakiola.calendula.ui.calendars.CalendarsScreen
 import de.jeanlucmakiola.floret.identity.fadeThrough
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
-import de.jeanlucmakiola.calendula.ui.common.EventMoveHost
-import de.jeanlucmakiola.calendula.ui.common.EventMoveScope
-import de.jeanlucmakiola.calendula.ui.common.LocalEventMove
-import de.jeanlucmakiola.calendula.ui.common.RescheduleViewModel
 import de.jeanlucmakiola.calendula.ui.common.drillToDay
 import de.jeanlucmakiola.calendula.ui.common.rememberCalendarSlideSpec
 import de.jeanlucmakiola.calendula.ui.common.selectView
@@ -80,7 +74,6 @@ fun CalendarHost(
     requestedImportUri: android.net.Uri? = null,
     onImportConsumed: () -> Unit = {},
     requestedInsertForm: EventForm? = null,
-    requestedInsertSource: ImportSource = ImportSource.Insert,
     onInsertConsumed: () -> Unit = {},
     requestedEditKey: LongArray? = null,
     onEditKeyConsumed: () -> Unit = {},
@@ -95,8 +88,6 @@ fun CalendarHost(
     // sensible non-empty initial values, so they're ready before the first frame.
     val quickSwitchViews = viewModel.quickSwitchViews.collectAsStateWithLifecycle().value
     val drawerViewOrder = viewModel.drawerViewOrder.collectAsStateWithLifecycle().value
-    // Whether the jump-to-today control sits in each view's top bar or the FAB (#60).
-    val todayInToolbar = viewModel.todayButtonInToolbar.collectAsStateWithLifecycle().value
 
     var viewStack by rememberSaveable(stateSaver = viewStackSaver) {
         mutableStateOf(listOf(defaultView))
@@ -155,10 +146,6 @@ fun CalendarHost(
     // over Settings and survives view switches.
     var showCalendars by rememberSaveable { mutableStateOf(false) }
 
-    // Backup & restore (#69) — hoisted like the manager, being driven by the
-    // calendar list rather than by preferences. Reached from both.
-    var showBackup by rememberSaveable { mutableStateOf(false) }
-
     // Event form (v1.2 create) — same held-key pattern as the detail screen:
     // [heldCreateIso] keeps the prefill date alive through the slide-out.
     // [createStartMinutes] is the tapped slot's start (minutes from midnight)
@@ -209,7 +196,7 @@ fun CalendarHost(
     // reveals on top of whatever was open without extra dismissal.
     LaunchedEffect(requestedInsertForm) {
         if (requestedInsertForm != null) {
-            importFormSource = requestedInsertSource
+            importFormSource = ImportSource.Insert
             importForm = requestedInsertForm
             onInsertConsumed()
         }
@@ -221,7 +208,6 @@ fun CalendarHost(
     fun dismissCoveringOverlays() {
         showSettings = false
         showCalendars = false
-        showBackup = false
         detailKey = null
         editKey = null
         importUri = null
@@ -299,37 +285,14 @@ fun CalendarHost(
         }
     }
 
-    // Drag to reschedule (#68). Hosted here so one instance serves every view and
-    // survives view switches; the calendar surfaces read it out of LocalEventMove.
-    val reschedule: RescheduleViewModel = hiltViewModel()
-    val movableCalendarIds by reschedule.movableCalendarIds.collectAsStateWithLifecycle()
-    val onEditEvent: (EventInstance) -> Unit = { event ->
-        val key = longArrayOf(
-            event.eventId,
-            event.start.toEpochMilliseconds(),
-            event.end.toEpochMilliseconds(),
-        )
-        heldEditKey = key
-        editKey = key
-    }
-    val moveScope = remember(movableCalendarIds, reschedule) {
-        EventMoveScope(
-            movableCalendarIds = movableCalendarIds,
-            move = reschedule::move,
-            inFlight = reschedule.inFlight,
-            undoStarted = reschedule.undoStarted,
-            edit = onEditEvent,
-        )
-    }
-
     val slideSpec = rememberCalendarSlideSpec()
 
     // Base-level back: pop the view stack while no overlay covers it (each overlay
     // owns its own BackHandler and takes precedence). Disabled at the home view,
     // so back there falls through to the system and exits the app.
     val anyOverlayVisible = showSearch || detailKey != null || createDateIso != null ||
-        editKey != null || showSettings || showCalendars || showBackup ||
+        editKey != null || showSettings || showCalendars || importUri != null ||
-        importUri != null || importForm != null
+        importForm != null
     BackHandler(enabled = !anyOverlayVisible && viewStack.size > 1) {
         viewStack = viewStack.dropLast(1)
     }
@@ -339,7 +302,6 @@ fun CalendarHost(
         // navigation, so it fades through rather than sliding — paging *within* a
         // view keeps the directional slide. AnimatedContent keyed on the view type.
         val viewSwitch = fadeThrough()
-        CompositionLocalProvider(LocalEventMove provides moveScope) {
         AnimatedContent(
             targetState = view,
             transitionSpec = { viewSwitch },
@@ -356,7 +318,6 @@ fun CalendarHost(
                     onCreateEvent = onCreateEvent,
                     quickSwitchViews = quickSwitchViews,
                     drawerViewOrder = drawerViewOrder,
-                    todayInToolbar = todayInToolbar,
                 )
                 CalendarView.Day -> DayScreen(
                     selectedView = currentView,
@@ -368,19 +329,16 @@ fun CalendarHost(
                     initialDateIso = pendingDayIso,
                     quickSwitchViews = quickSwitchViews,
                     drawerViewOrder = drawerViewOrder,
-                    todayInToolbar = todayInToolbar,
                 )
                 CalendarView.Month -> MonthScreen(
                     selectedView = currentView,
                     onSelectView = onSelectView,
                     onOpenDay = onOpenDay,
-                    onEventClick = onEventClick,
                     onOpenSettings = onOpenSettings,
                     onOpenSearch = onOpenSearch,
                     onCreateEvent = onCreateEvent,
                     quickSwitchViews = quickSwitchViews,
                     drawerViewOrder = drawerViewOrder,
-                    todayInToolbar = todayInToolbar,
                 )
                 CalendarView.Agenda -> AgendaScreen(
                     selectedView = currentView,
@@ -392,15 +350,9 @@ fun CalendarHost(
                     onCreateEvent = onCreateEvent,
                     quickSwitchViews = quickSwitchViews,
                     drawerViewOrder = drawerViewOrder,
-                    todayInToolbar = todayInToolbar,
                 )
             }
         }
-        }
-
-        // Scope prompt + confirmation/undo snackbar for a dropped event, declared
-        // right after the calendar views so later overlays cover it.
-        EventMoveHost(reschedule, modifier = Modifier.fillMaxSize())
 
         // Search overlay — below detail/edit in the Box so a tapped result's
         // detail screen draws on top, and closing it returns to the results.
@@ -456,7 +408,6 @@ fun CalendarHost(
                     initialStartMinutes = createStartMinutes ?: heldCreateMinutes,
                     onClose = { createDateIso = null },
                     onSaved = { createDateIso = null },
-                    onManageCalendars = { showCalendars = true },
                 )
             }
         }
@@ -476,7 +427,6 @@ fun CalendarHost(
                         editKey = null
                         detailKey = null
                     },
-                    onManageCalendars = { showCalendars = true },
                 )
             }
         }
@@ -490,7 +440,18 @@ fun CalendarHost(
             SettingsScreen(
                 onBack = { showSettings = false },
                 onManageCalendars = { showCalendars = true },
-                onOpenBackup = { showBackup = true },
+            )
+        }
+
+        // Calendar manager — slides over Settings.
+        AnimatedVisibility(
+            visible = showCalendars,
+            enter = slideInHorizontally(slideSpec) { it } + fadeIn(),
+            exit = slideOutHorizontally(slideSpec) { it } + fadeOut(),
+        ) {
+            CalendarsScreen(
+                onBack = { showCalendars = false },
+                onImport = { importUri = it; importForceMany = true },
             )
         }
 
@@ -501,7 +462,6 @@ fun CalendarHost(
                 uri = uri,
                 forceMany = importForceMany,
                 onClose = { importUri = null },
-                onManageCalendars = { showCalendars = true },
                 onOpenSingle = { form ->
                     importUri = null
                     importFormSource = ImportSource.File
@@ -516,40 +476,6 @@ fun CalendarHost(
                 initialFormSource = importFormSource,
                 onClose = { importForm = null },
                 onSaved = { importForm = null },
-                onManageCalendars = { showCalendars = true },
-            )
-        }
-
-        // Declared last so it covers every overlay that can open it: Settings,
-        // both event forms, and the .ics import picker (#76).
-        AnimatedVisibility(
-            visible = showCalendars,
-            enter = slideInHorizontally(slideSpec) { it } + fadeIn(),
-            exit = slideOutHorizontally(slideSpec) { it } + fadeOut(),
-        ) {
-            CalendarsScreen(
-                onBack = { showCalendars = false },
-                onOpenBackup = { showBackup = true },
-            )
-        }
-
-        // Backup & restore — over the manager, since the manager links into it.
-        AnimatedVisibility(
-            visible = showBackup,
-            enter = slideInHorizontally(slideSpec) { it } + fadeIn(),
-            exit = slideOutHorizontally(slideSpec) { it } + fadeOut(),
-        ) {
-            BackupScreen(
-                onBack = { showBackup = false },
-                // Restore runs the normal .ics import, and both this screen and
-                // the manager that can have opened it are declared above the
-                // import overlays — so both have to step aside.
-                onImport = {
-                    importUri = it
-                    importForceMany = true
-                    showBackup = false
-                    showCalendars = false
-                },
             )
         }
     }

app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHostViewModel.kt

@@ -45,12 +45,4 @@ class CalendarHostViewModel @Inject constructor(
             started = SharingStarted.WhileSubscribed(5_000L),
             initialValue = IMPLEMENTED_VIEWS,
         )
-
-    /** Whether each view's jump-to-today control lives in the top bar, not the FAB (#60). */
-    val todayButtonInToolbar: StateFlow<Boolean> = prefs.todayButtonInToolbar
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = false,
-        )
 }

app/src/main/java/de/jeanlucmakiola/calendula/ui/RootScreen.kt

@@ -7,7 +7,6 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -22,8 +21,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import de.jeanlucmakiola.calendula.data.contacts.SpecialDatesScheduler
 import de.jeanlucmakiola.calendula.data.contacts.hasContactsPermission
-import de.jeanlucmakiola.calendula.ui.calendars.CalendarVisibilityNoticeDialog
-import de.jeanlucmakiola.calendula.ui.calendars.CalendarVisibilityNoticeViewModel
 import de.jeanlucmakiola.calendula.ui.permission.PermissionScreen
 import de.jeanlucmakiola.calendula.ui.permission.ReminderOnboardingScreen
 import de.jeanlucmakiola.calendula.ui.permission.ReminderOnboardingViewModel
@@ -39,8 +36,6 @@ fun RootScreen(
     requestedImportUri: android.net.Uri? = null,
     onImportConsumed: () -> Unit = {},
     requestedInsertForm: de.jeanlucmakiola.calendula.domain.EventForm? = null,
-    requestedInsertSource: de.jeanlucmakiola.calendula.ui.edit.ImportSource =
-        de.jeanlucmakiola.calendula.ui.edit.ImportSource.Insert,
     onInsertConsumed: () -> Unit = {},
     requestedEditKey: LongArray? = null,
     onEditKeyConsumed: () -> Unit = {},
@@ -53,10 +48,6 @@ fun RootScreen(
         )
     }
 
-    // A launch scan already covers the app coming up with the permission, so
-    // only a grant made during this session owes a re-scan.
-    val grantedAtLaunch = remember { hasPermission }
-
     val lifecycle = LocalLifecycleOwner.current.lifecycle
     DisposableEffect(lifecycle) {
         val obs = LifecycleEventObserver { _, event ->
@@ -87,19 +78,6 @@ fun RootScreen(
             // frame instead of flashing the wrong screen.
             val reminderOnboarding: ReminderOnboardingViewModel = hiltViewModel()
             val onboardingDone by reminderOnboarding.onboardingDone.collectAsStateWithLifecycle()
-            // One-time explainer for the switch to the device's own calendar
-            // visibility (#75), armed by the reconciler.
-            val visibilityNotice: CalendarVisibilityNoticeViewModel = hiltViewModel()
-            val noticePending by visibilityNotice.pending.collectAsStateWithLifecycle()
-            // Runs on entry however the permission was granted, including via
-            // Android's app-settings screen (caught by the ON_RESUME above).
-            LaunchedEffect(Unit) {
-                visibilityNotice.reconcile()
-                if (!grantedAtLaunch) reminderOnboarding.rearmAfterGrant()
-            }
-            if (onboardingDone == true && noticePending) {
-                CalendarVisibilityNoticeDialog(onDismiss = visibilityNotice::dismiss)
-            }
             Crossfade(targetState = onboardingDone, animationSpec = gateSpec, label = "onboardingGate") { done ->
                 when (done) {
                     true -> CalendarHost(
@@ -111,7 +89,6 @@ fun RootScreen(
                         requestedImportUri = requestedImportUri,
                         onImportConsumed = onImportConsumed,
                         requestedInsertForm = requestedInsertForm,
-                        requestedInsertSource = requestedInsertSource,
                         onInsertConsumed = onInsertConsumed,
                         requestedEditKey = requestedEditKey,
                         onEditKeyConsumed = onEditKeyConsumed,

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaRange.kt

@@ -1,6 +1,6 @@
 package de.jeanlucmakiola.calendula.ui.agenda
 
-import de.jeanlucmakiola.floret.locale.localizedDateFormatter
+import de.jeanlucmakiola.calendula.ui.common.localizedDateFormatter
 import kotlinx.datetime.DayOfWeek
 import kotlinx.datetime.LocalDate
 import java.time.YearMonth
@@ -92,27 +92,20 @@ fun parseAgendaRange(stored: String?, default: AgendaRange): AgendaRange = when
  * - [AgendaRange.ThisMonth] → month and year ("June 2026")
  * - everything else → "start – end" ("27 Jun – 3 Jul 2026"), with the start's
  *   year shown too only when it differs from the end's.
- *
- * [monthAsSpan] puts [AgendaRange.ThisMonth] on the "start – end" form as well.
- * The agenda's own header browses the whole month, so the month name is right
- * there; the range picker previews the window an option opens *today*, which for
- * "This month" is only the rest of it.
  */
 fun agendaRangeWindowSummary(
     range: AgendaRange,
     start: LocalDate,
     end: LocalDate,
     locale: Locale,
-    monthAsSpan: Boolean = false,
 ): String {
     val javaStart = java.time.LocalDate.of(start.year, start.month.ordinal + 1, start.day)
     val javaEnd = java.time.LocalDate.of(end.year, end.month.ordinal + 1, end.day)
     val dayMonth = localizedDateFormatter(locale, "dMMM")
     val dayMonthYear = localizedDateFormatter(locale, "dMMMy")
-    return when {
+    return when (range) {
-        range == AgendaRange.Day -> dayMonthYear.format(javaStart)
+        AgendaRange.Day -> dayMonthYear.format(javaStart)
-        range == AgendaRange.ThisMonth && !monthAsSpan ->
+        AgendaRange.ThisMonth -> localizedDateFormatter(locale, "LLLLy").format(javaStart)
-            localizedDateFormatter(locale, "LLLLy").format(javaStart)
         else -> {
             val startFmt = if (start.year == end.year) dayMonth else dayMonthYear
             "${startFmt.format(javaStart)} – ${dayMonthYear.format(javaEnd)}"

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaRows.kt

@@ -1,207 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.agenda
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Coffee
-import androidx.compose.material3.Card
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.EventInstance
-import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
-import de.jeanlucmakiola.calendula.ui.common.LocalSoftenColors
-import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
-import de.jeanlucmakiola.calendula.ui.common.eventAccent
-import de.jeanlucmakiola.calendula.ui.common.eventFill
-import de.jeanlucmakiola.calendula.ui.common.formatTimeOfDay
-import de.jeanlucmakiola.floret.components.GroupedRow
-import de.jeanlucmakiola.floret.components.Position
-import de.jeanlucmakiola.floret.locale.currentLocale
-import de.jeanlucmakiola.floret.locale.localizedDateFormatter
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.plus
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Instant
-import java.util.Locale
-
-// The agenda's row vocabulary, split out of AgendaScreen so the month view's
-// split style can list a day with exactly the same visual language instead of
-// growing a parallel set of event rows.
-
-@Composable
-internal fun AgendaDayHeader(
-    date: LocalDate,
-    today: LocalDate,
-    onOpenDay: (LocalDate) -> Unit,
-) {
-    Surface(
-        color = MaterialTheme.colorScheme.surface,
-        modifier = Modifier
-            .fillMaxWidth()
-            .clickable { onOpenDay(date) },
-    ) {
-        Text(
-            text = agendaDayLabel(date, today),
-            style = MaterialTheme.typography.titleSmall,
-            color = if (date == today) {
-                MaterialTheme.colorScheme.primary
-            } else {
-                MaterialTheme.colorScheme.onSurfaceVariant
-            },
-            modifier = Modifier.padding(start = 28.dp, end = 28.dp, top = 16.dp, bottom = 8.dp),
-        )
-    }
-}
-
-/**
- * A card standing in for a day with no events — the same coffee-cup motif as the
- * agenda's full-screen empty state, boxed into a card so the day keeps a visible slot
- * rather than a bare header. Used for an anchored, event-less today (#35) and for
- * an empty selected day in the month view's split style.
- */
-@Composable
-internal fun AgendaEmptyDayRow(text: String, onClick: () -> Unit) {
-    Card(
-        // Match a single event row's resting corner radius (floret groupedShape).
-        shape = RoundedCornerShape(22.dp),
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 4.dp)
-            .clickable(onClick = onClick),
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 18.dp, horizontal = 16.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Icon(
-                imageVector = Icons.Filled.Coffee,
-                contentDescription = null,
-                tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.size(36.dp),
-            )
-            Spacer(Modifier.height(8.dp))
-            Text(
-                text = text,
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                textAlign = TextAlign.Center,
-            )
-        }
-    }
-}
-
-@Composable
-internal fun AgendaEventRow(
-    event: EventInstance,
-    day: LocalDate,
-    zone: TimeZone,
-    position: Position,
-    dimmed: Boolean,
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-) {
-    val dark = isSystemInDarkTheme()
-    val soften = LocalSoftenColors.current
-    val title = event.title.ifBlank { stringResource(R.string.event_untitled) }
-    GroupedRow(
-        modifier = if (dimmed) modifier.alpha(EventDimAlpha) else modifier,
-        title = title,
-        summary = agendaTimeSummary(event, day, zone),
-        position = position,
-        minHeight = 64.dp,
-        leading = {
-            Box(
-                modifier = Modifier
-                    .size(width = 6.dp, height = 36.dp)
-                    .clip(RoundedCornerShape(3.dp))
-                    .background(eventAccent(event.color, dark, soften)),
-            )
-        },
-        onClick = onClick,
-    )
-}
-
-/** "Today · Wed, 17. Jun 2026" — relative word for today/tomorrow, else the date. */
-@Composable
-internal fun agendaDayLabel(date: LocalDate, today: LocalDate): String {
-    val relative = when (date) {
-        today -> stringResource(R.string.agenda_header_today)
-        today.plus(1, DateTimeUnit.DAY) -> stringResource(R.string.agenda_header_tomorrow)
-        else -> null
-    }
-    val formatted = formatAgendaDate(date)
-    return if (relative != null) "$relative · $formatted" else formatted
-}
-
-/**
- * Time line under the title: "09:00 – 10:00 · Location", "All day", etc.
- *
- * A multi-day event shows only the part relevant to [day], spelled out so each
- * day reads on its own: its first day names the start ("Starts 14:00"), its last
- * day the end ("Ends 10:00"), and any whole day in between reads as "All day".
- * An all-day multi-day event is simply "All day" on every day it covers.
- */
-@Composable
-internal fun agendaTimeSummary(event: EventInstance, day: LocalDate, zone: TimeZone): String {
-    val is24Hour = LocalUse24HourFormat.current
-    val locale = currentLocale()
-
-    val time = when (val label = agendaTimeLabel(event, day, zone)) {
-        AgendaTimeLabel.AllDay -> stringResource(R.string.event_detail_all_day)
-        is AgendaTimeLabel.Starts -> stringResource(
-            R.string.agenda_span_starts,
-            formatTime(label.start, zone, is24Hour, locale),
-        )
-        is AgendaTimeLabel.Ends -> stringResource(
-            R.string.agenda_span_ends,
-            formatTime(label.end, zone, is24Hour, locale),
-        )
-        is AgendaTimeLabel.Range -> "${formatTime(label.start, zone, is24Hour, locale)} – " +
-            formatTime(label.end, zone, is24Hour, locale)
-    }
-
-    val location = event.location?.takeIf { it.isNotBlank() }
-    return if (location != null) "$time · $location" else time
-}
-
-private fun formatTime(
-    instant: Instant,
-    zone: TimeZone,
-    is24Hour: Boolean,
-    locale: Locale,
-): String {
-    val t = instant.toLocalDateTime(zone).time
-    return formatTimeOfDay(t.hour, t.minute, is24Hour, locale)
-}
-
-private fun formatAgendaDate(date: LocalDate): String {
-    val locale = Locale.getDefault()
-    val java = java.time.LocalDate.of(date.year, date.month.ordinal + 1, date.day)
-    // Weekday + date in the locale's own field order (e.g. "Wed, Jun 17, 2026"
-    // vs "Mi., 17. Juni 2026") rather than a hardcoded day-month-year layout.
-    return localizedDateFormatter(locale, "EEEdMMMy").format(java)
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaScreen.kt

@@ -1,6 +1,9 @@
 package de.jeanlucmakiola.calendula.ui.agenda
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -14,11 +17,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Coffee
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -27,6 +32,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
@@ -40,6 +46,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -51,27 +59,36 @@ import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.domain.EventInstance
 import de.jeanlucmakiola.calendula.domain.hasEnded
 import de.jeanlucmakiola.calendula.ui.common.AgendaRangePicker
+import de.jeanlucmakiola.calendula.ui.common.LocalSoftenColors
+import de.jeanlucmakiola.calendula.ui.common.eventFill
 import de.jeanlucmakiola.calendula.ui.common.agendaRangeLabel
 import de.jeanlucmakiola.floret.identity.animateItemMotion
 import de.jeanlucmakiola.calendula.ui.common.CalendarDrawer
 import de.jeanlucmakiola.calendula.ui.common.CalendarFabColumn
-import de.jeanlucmakiola.calendula.ui.common.TodayAction
 import de.jeanlucmakiola.calendula.ui.common.CalendarFailure
 import de.jeanlucmakiola.calendula.ui.common.CalendarView
 import de.jeanlucmakiola.calendula.ui.common.IMPLEMENTED_VIEWS
+import de.jeanlucmakiola.calendula.ui.common.localizedDateFormatter
+import de.jeanlucmakiola.calendula.ui.common.EventDimAlpha
+import de.jeanlucmakiola.floret.components.GroupedRow
+import de.jeanlucmakiola.floret.components.Position
 import de.jeanlucmakiola.calendula.ui.common.ViewSwitcherPill
 import de.jeanlucmakiola.calendula.ui.common.next
 import de.jeanlucmakiola.floret.components.positionOf
 import de.jeanlucmakiola.calendula.ui.common.rememberCurrentMinute
-import de.jeanlucmakiola.floret.locale.currentLocale
+import de.jeanlucmakiola.calendula.ui.common.currentLocale
+import de.jeanlucmakiola.calendula.ui.common.LocalUse24HourFormat
+import de.jeanlucmakiola.calendula.ui.common.formatTimeOfDay
 import kotlinx.coroutines.launch
+import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
+import kotlinx.datetime.plus
+import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Instant
+import java.util.Locale
 
-// No file-level zone constant here on purpose: it would be fixed for the process
+private val zone = TimeZone.currentSystemDefault()
-// lifetime and drift from the zone AgendaViewModel groups in after a device
-// time-zone change. The zone travels on AgendaUiState.Success instead.
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -85,7 +102,6 @@ fun AgendaScreen(
     onCreateEvent: (LocalDate, Int?) -> Unit,
     quickSwitchViews: List<CalendarView> = IMPLEMENTED_VIEWS,
     drawerViewOrder: List<CalendarView> = IMPLEMENTED_VIEWS,
-    todayInToolbar: Boolean = false,
     modifier: Modifier = Modifier,
     viewModel: AgendaViewModel = hiltViewModel(),
 ) {
@@ -93,7 +109,6 @@ fun AgendaScreen(
     val anchor by viewModel.anchor.collectAsStateWithLifecycle()
     val pastDisplay by viewModel.pastEventDisplay.collectAsStateWithLifecycle()
     val showToday by viewModel.showToday.collectAsStateWithLifecycle()
-    val weekStart by viewModel.weekStart.collectAsStateWithLifecycle()
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
     val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -112,7 +127,6 @@ fun AgendaScreen(
             CalendarDrawer(
                 currentView = selectedView,
                 currentDate = anchor,
-                drawerState = drawerState,
                 viewOrder = drawerViewOrder,
                 onSelectView = { view ->
                     onSelectView(view)
@@ -137,14 +151,12 @@ fun AgendaScreen(
                     onCycleView = { onSelectView(selectedView.next(quickSwitchViews)) },
                     onOpenDrawer = { scope.launch { drawerState.open() } },
                     onOpenSearch = onOpenSearch,
-                    showTodayButton = todayInToolbar,
-                    onToday = viewModel::goToToday,
                     scrollBehavior = scrollBehavior,
                 )
             },
             floatingActionButton = {
                 CalendarFabColumn(
-                    todayVisible = !isOnToday && !todayInToolbar,
+                    todayVisible = !isOnToday,
                     todayText = stringResource(R.string.agenda_today_action),
                     onToday = viewModel::goToToday,
                     onCreate = { onCreateEvent(anchor, null) },
@@ -200,7 +212,6 @@ fun AgendaScreen(
             title = stringResource(R.string.settings_agenda_range),
             description = stringResource(R.string.agenda_range_override_hint),
             selected = successState?.range ?: AgendaRange.Month,
-            weekStart = weekStart,
             onSelect = viewModel::setRangeOverride,
             onDismiss = { showRangePicker = false },
         )
@@ -317,7 +328,6 @@ private fun AgendaContent(
                 AgendaList(
                     days = days,
                     today = state.today,
-                    zone = state.zone,
                     dimPast = pastDisplay == PastEventDisplay.DIM,
                     now = now,
                     onEventClick = onEventClick,
@@ -334,7 +344,6 @@ private fun AgendaContent(
 private fun AgendaList(
     days: List<AgendaDay>,
     today: LocalDate,
-    zone: TimeZone,
     dimPast: Boolean,
     now: Instant,
     onEventClick: (EventInstance) -> Unit,
@@ -353,23 +362,15 @@ private fun AgendaList(
             if (day.events.isEmpty()) {
                 // An anchored, event-less today (#35) — "nothing left today".
                 item(key = "placeholder-${day.date}") {
-                    AgendaEmptyDayRow(
+                    AgendaEmptyDayRow(onClick = { onOpenDay(day.date) })
-                        text = stringResource(R.string.agenda_no_more_today),
-                        onClick = { onOpenDay(day.date) },
-                    )
                 }
             } else {
                 itemsIndexed(
                     items = day.events,
-                    // Scope the key by day: a multi-day event appears under every
+                    key = { _, event -> event.instanceId },
-                    // day it spans, so its instanceId alone is not unique across
-                    // the list (LazyColumn requires unique keys).
-                    key = { _, event -> "${day.date}-${event.instanceId}" },
                 ) { index, event ->
                     AgendaEventRow(
                         event = event,
-                        day = day.date,
-                        zone = zone,
                         position = positionOf(index, day.events.size),
                         dimmed = dimPast && event.hasEnded(now),
                         modifier = animateItemMotion(),
@@ -382,6 +383,98 @@ private fun AgendaList(
     }
 }
 
+@Composable
+private fun AgendaDayHeader(
+    date: LocalDate,
+    today: LocalDate,
+    onOpenDay: (LocalDate) -> Unit,
+) {
+    Surface(
+        color = MaterialTheme.colorScheme.surface,
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onOpenDay(date) },
+    ) {
+        Text(
+            text = agendaDayLabel(date, today),
+            style = MaterialTheme.typography.titleSmall,
+            color = if (date == today) {
+                MaterialTheme.colorScheme.primary
+            } else {
+                MaterialTheme.colorScheme.onSurfaceVariant
+            },
+            modifier = Modifier.padding(start = 28.dp, end = 28.dp, top = 16.dp, bottom = 8.dp),
+        )
+    }
+}
+
+/**
+ * A card under an anchored, event-less today (#35) — the same coffee-cup motif
+ * as the full-screen [AgendaEmpty] state, boxed into a card so today keeps a
+ * visible slot when nothing is left rather than a bare header.
+ */
+@Composable
+private fun AgendaEmptyDayRow(onClick: () -> Unit) {
+    Card(
+        // Match a single event row's resting corner radius (floret groupedShape).
+        shape = RoundedCornerShape(22.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 4.dp)
+            .clickable(onClick = onClick),
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 18.dp, horizontal = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Icon(
+                imageVector = Icons.Filled.Coffee,
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.size(36.dp),
+            )
+            Spacer(Modifier.height(8.dp))
+            Text(
+                text = stringResource(R.string.agenda_no_more_today),
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+@Composable
+private fun AgendaEventRow(
+    event: EventInstance,
+    position: Position,
+    dimmed: Boolean,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    val dark = isSystemInDarkTheme()
+    val soften = LocalSoftenColors.current
+    val title = event.title.ifBlank { stringResource(R.string.event_untitled) }
+    GroupedRow(
+        modifier = if (dimmed) modifier.alpha(EventDimAlpha) else modifier,
+        title = title,
+        summary = agendaTimeSummary(event),
+        position = position,
+        minHeight = 64.dp,
+        leading = {
+            Box(
+                modifier = Modifier
+                    .size(width = 6.dp, height = 36.dp)
+                    .clip(RoundedCornerShape(3.dp))
+                    .background(eventFill(event.color, dark, soften)),
+            )
+        },
+        onClick = onClick,
+    )
+}
+
 @Composable
 private fun AgendaEmpty(modifier: Modifier = Modifier) {
     Column(
@@ -411,8 +504,6 @@ private fun AgendaTopBar(
     onCycleView: () -> Unit,
     onOpenDrawer: () -> Unit,
     onOpenSearch: () -> Unit,
-    showTodayButton: Boolean,
-    onToday: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior,
 ) {
     TopAppBar(
@@ -431,7 +522,6 @@ private fun AgendaTopBar(
             }
         },
         actions = {
-            TodayAction(show = showTodayButton, onToday = onToday)
             IconButton(onClick = onOpenSearch) {
                 Icon(
                     imageVector = Icons.Default.Search,
@@ -451,3 +541,42 @@ private fun AgendaTopBar(
         scrollBehavior = scrollBehavior,
     )
 }
+
+/** "Today · Wed, 17. Jun 2026" — relative word for today/tomorrow, else the date. */
+@Composable
+private fun agendaDayLabel(date: LocalDate, today: LocalDate): String {
+    val relative = when (date) {
+        today -> stringResource(R.string.agenda_header_today)
+        today.plus(1, DateTimeUnit.DAY) -> stringResource(R.string.agenda_header_tomorrow)
+        else -> null
+    }
+    val formatted = formatAgendaDate(date)
+    return if (relative != null) "$relative · $formatted" else formatted
+}
+
+/** Time line under the title: "09:00 – 10:00 · Location", "All day", etc. */
+@Composable
+private fun agendaTimeSummary(event: EventInstance): String {
+    val time = if (event.isAllDay) {
+        stringResource(R.string.event_detail_all_day)
+    } else {
+        val is24Hour = LocalUse24HourFormat.current
+        val locale = currentLocale()
+        "${formatTime(event.start, is24Hour, locale)} – ${formatTime(event.end, is24Hour, locale)}"
+    }
+    val location = event.location?.takeIf { it.isNotBlank() }
+    return if (location != null) "$time · $location" else time
+}
+
+private fun formatTime(instant: Instant, is24Hour: Boolean, locale: Locale): String {
+    val t = instant.toLocalDateTime(zone).time
+    return formatTimeOfDay(t.hour, t.minute, is24Hour, locale)
+}
+
+private fun formatAgendaDate(date: LocalDate): String {
+    val locale = Locale.getDefault()
+    val java = java.time.LocalDate.of(date.year, date.month.ordinal + 1, date.day)
+    // Weekday + date in the locale's own field order (e.g. "Wed, Jun 17, 2026"
+    // vs "Mi., 17. Juni 2026") rather than a hardcoded day-month-year layout.
+    return localizedDateFormatter(locale, "EEEdMMMy").format(java)
+}

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaUiState.kt

@@ -2,43 +2,9 @@ package de.jeanlucmakiola.calendula.ui.agenda
 
 import de.jeanlucmakiola.calendula.domain.EventInstance
 import de.jeanlucmakiola.calendula.domain.FailureReason
-import de.jeanlucmakiola.calendula.domain.spanFirstDay
-import de.jeanlucmakiola.calendula.domain.spanLastDay
-import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
-import kotlinx.datetime.plus
+import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Instant
-
-/**
- * What an agenda row's time line should convey for an event on a given day —
- * the part of a multi-day span that [day] falls in. Pure and shared so the
- * agenda screen and the agenda widget label multi-day events identically; each
- * surface only formats the instants into its own locale/24h string.
- */
-sealed interface AgendaTimeLabel {
-    /** An all-day event, or a whole in-between day of a multi-day span. */
-    data object AllDay : AgendaTimeLabel
-    /** The first day of a multi-day timed event: when it begins. */
-    data class Starts(val start: Instant) : AgendaTimeLabel
-    /** The last day of a multi-day timed event: when it ends. */
-    data class Ends(val end: Instant) : AgendaTimeLabel
-    /** A single-day timed event: its start–end range. */
-    data class Range(val start: Instant, val end: Instant) : AgendaTimeLabel
-}
-
-/** The [AgendaTimeLabel] for [event] as it appears on [day], resolved in [zone]. */
-fun agendaTimeLabel(event: EventInstance, day: LocalDate, zone: TimeZone): AgendaTimeLabel {
-    if (event.isAllDay) return AgendaTimeLabel.AllDay
-    val firstDay = event.spanFirstDay(zone)
-    val lastDay = event.spanLastDay(zone)
-    return when {
-        firstDay == lastDay -> AgendaTimeLabel.Range(event.start, event.end)
-        day <= firstDay -> AgendaTimeLabel.Starts(event.start)
-        day >= lastDay -> AgendaTimeLabel.Ends(event.end)
-        else -> AgendaTimeLabel.AllDay // a full in-between day
-    }
-}
 
 /** One calendar day with at least one event, for the agenda list. */
 data class AgendaDay(
@@ -49,41 +15,22 @@ data class AgendaDay(
 
 /**
  * Group flat [instances] into forward-looking [AgendaDay]s (only days that
- * actually carry events). A multi-day event surfaces on *every* day it spans,
+ * actually carry events). An event that began before [anchor] (ongoing or
- * not just its first — clamped to [[anchor], [windowEnd]] so an event that began
+ * multi-day) is clamped to the anchor day so it still surfaces on top. Within a
- * before the window (ongoing) still lists from the anchor day, and one running
+ * day, all-day events sort first, then ascending by start time, then title.
- * past the window stops at the last visible day. Within a day, all-day events
- * sort first, then ascending by start time, then title.
  *
  * Shared by the Agenda screen and the agenda home-screen widget so both group
  * and order identically.
  */
 fun groupAgendaDays(
     anchor: LocalDate,
-    windowEnd: LocalDate,
     instances: List<EventInstance>,
     zone: TimeZone,
-): List<AgendaDay> {
+): List<AgendaDay> =
-    val byDay = sortedMapOf<LocalDate, MutableList<EventInstance>>()
+    instances
-    for (instance in instances) {
+        .groupBy { it.start.toLocalDateTime(zone).date.coerceAtLeast(anchor) }
-        val firstDay = instance.spanFirstDay(zone).coerceAtLeast(anchor)
+        .toSortedMap()
-        val lastDay = instance.spanLastDay(zone).coerceAtMost(windowEnd)
+        .map { (date, dayEvents) ->
-        // Skip instances that don't actually occupy any day in [[anchor], [windowEnd]].
-        // The provider returns an event whenever its instant span overlaps the query
-        // window, but all-day events live at UTC midnights with an exclusive end: east
-        // of UTC that end dips just past local midnight, so *yesterday's* all-day event
-        // overlaps today's window start and comes back even though its true last day
-        // (resolved in UTC) is before the anchor. Clamping it up to the anchor would
-        // surface it under "today" (issue #65); drop it instead. The symmetric case —
-        // a next-day all-day event overlapping the window's last instant — drops too.
-        if (lastDay < firstDay) continue
-        var day = firstDay
-        while (day <= lastDay) {
-            byDay.getOrPut(day) { mutableListOf() }.add(instance)
-            day = day.plus(1, DateTimeUnit.DAY)
-        }
-    }
-    return byDay.map { (date, dayEvents) ->
             AgendaDay(
                 date = date,
                 events = dayEvents.sortedWith(
@@ -93,7 +40,6 @@ fun groupAgendaDays(
                 ),
             )
         }
-}
 
 /**
  * Ensure [today] surfaces as the first agenda day even when it carries no
@@ -133,12 +79,5 @@ sealed interface AgendaUiState {
         val rangeEnd: LocalDate,
         /** Whether to show the top range bar — header + switcher (toggle, on by default). */
         val showRangeBar: Boolean,
-        /**
-         * The zone [days] were grouped in. Carried in the state rather than
-         * re-read by the screen so labelling and grouping cannot disagree: an
-         * event's "Starts …/Ends …/All day" line is only correct relative to the
-         * same zone that decided which day it was filed under.
-         */
-        val zone: TimeZone,
     ) : AgendaUiState
 }

app/src/main/java/de/jeanlucmakiola/calendula/ui/agenda/AgendaViewModel.kt

@@ -7,7 +7,7 @@ import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository
 import de.jeanlucmakiola.calendula.data.di.IoDispatcher
 import de.jeanlucmakiola.calendula.data.prefs.PastEventDisplay
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
-import de.jeanlucmakiola.calendula.data.prefs.firstDayOfWeek
+import de.jeanlucmakiola.calendula.data.prefs.resolveFirstDay
 import de.jeanlucmakiola.calendula.domain.CalendarSource
 import de.jeanlucmakiola.calendula.domain.EventInstance
 import de.jeanlucmakiola.calendula.domain.FailureReason
@@ -20,11 +20,13 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.DayOfWeek
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
+import java.util.Locale
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.atTime
 import kotlinx.datetime.plus
@@ -48,12 +50,9 @@ class AgendaViewModel @Inject constructor(
         settingsPrefs.agendaShowRangeBar,
     ) { range, showBar -> AgendaSettings(range, showBar) }
 
-    /**
+    // First day of the week, for the calendar-aligned "this week" range.
-     * First day of the week, for the calendar-aligned "this week" range. Public
+    private val weekStartDay = settingsPrefs.weekStart
-     * because the range picker resolves each option to real dates, which needs
+        .map { it.resolveFirstDay(Locale.getDefault()) }
-     * the same week start the window is built from.
-     */
-    val weekStart: StateFlow<DayOfWeek> = settingsPrefs.firstDayOfWeek(viewModelScope)
 
     /**
      * How to treat events that already ended today (show / dim / hide). A display
@@ -94,7 +93,7 @@ class AgendaViewModel @Inject constructor(
     private val _rangeOverride = MutableStateFlow<AgendaRange?>(null)
 
     val state: StateFlow<AgendaUiState> =
-        combine(_anchor, agendaSettings, _rangeOverride, weekStart) { anchor, settings, override, weekStart ->
+        combine(_anchor, agendaSettings, _rangeOverride, weekStartDay) { anchor, settings, override, weekStart ->
             AgendaParams(
                 anchor = anchor,
                 range = override ?: settings.range,
@@ -160,11 +159,11 @@ class AgendaViewModel @Inject constructor(
             return AgendaUiState.Failure(FailureReason.NoCalendarsConfigured)
         }
         val anchor = params.anchor
+        val days = groupAgendaDays(anchor, instances, zone)
         val rangeEnd = anchor.plus(
             params.range.dayCount(anchor, params.weekStart) - 1,
             DateTimeUnit.DAY,
         )
-        val days = groupAgendaDays(anchor, rangeEnd, instances, zone)
         return AgendaUiState.Success(
             anchor = anchor,
             today = todayDate,
@@ -173,7 +172,6 @@ class AgendaViewModel @Inject constructor(
             rangeIsOverride = params.rangeIsOverride,
             rangeEnd = rangeEnd,
             showRangeBar = params.showRangeBar,
-            zone = zone,
         )
     }
 }

app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt

@@ -1,373 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.calendars
-
-import android.net.Uri
-import android.text.format.DateUtils
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FileDownload
-import androidx.compose.material.icons.filled.FileUpload
-import androidx.compose.material.icons.filled.Schedule
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.listSaver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.pluralStringResource
-import androidx.compose.ui.res.stringArrayResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.core.net.toUri
-import androidx.documentfile.provider.DocumentFile
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.data.prefs.BackupStatus
-import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
-import de.jeanlucmakiola.calendula.domain.CalendarSource
-import de.jeanlucmakiola.calendula.domain.isEventTarget
-import de.jeanlucmakiola.calendula.ui.common.CalendarColorChip
-import de.jeanlucmakiola.calendula.ui.common.LeadingAvatar
-import de.jeanlucmakiola.floret.components.CollapsingScaffold
-import de.jeanlucmakiola.floret.components.DialogAmountField
-import de.jeanlucmakiola.floret.components.DialogUnitDropdown
-import de.jeanlucmakiola.floret.components.FullScreenPicker
-import de.jeanlucmakiola.floret.components.GroupedRow
-import de.jeanlucmakiola.floret.components.Position
-import de.jeanlucmakiola.floret.components.positionOf
-import java.time.LocalDate
-
-// SAF mime filter for the restore picker. Source apps hand `.ics` files out
-// under several mimes, so accept the common set.
-private val RESTORE_MIME_TYPES = arrayOf(
-    "text/calendar",
-    "application/octet-stream",
-    "text/plain",
-)
-
-/**
- * Backup & restore (#69): `.ics` export and restore for local calendars, with
- * optional automatic backup. Shares [CalendarsViewModel] with the manager.
- *
- * A full-screen destination hoisted in `CalendarHost`; [onBack] pops it,
- * [onImport] hands a picked file to the app's normal .ics import flow.
- */
-@Composable
-fun BackupScreen(
-    onBack: () -> Unit,
-    onImport: (Uri) -> Unit,
-    viewModel: CalendarsViewModel = hiltViewModel(),
-) {
-    val calendars by viewModel.calendars.collectAsStateWithLifecycle()
-    val backupResult by viewModel.backupResult.collectAsStateWithLifecycle()
-    val autoBackup by viewModel.autoBackup.collectAsStateWithLifecycle()
-
-    val context = LocalContext.current
-    val snackbarHostState = remember { SnackbarHostState() }
-
-    // Export covers local calendars only; managed special-dates mirrors are
-    // rebuilt from contacts. Restore can target anything the import picker offers.
-    val exportable = calendars.filter { it.isLocal && it.canModifyContents && !it.isManaged }
-    val canImport = calendars.any { it.isEventTarget }
-
-    // Exports everything eligible (null); the per-calendar selector owns its
-    // own launcher.
-    val createBackup = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.CreateDocument("text/calendar"),
-    ) { uri -> uri?.let { viewModel.exportBackup(it, null) } }
-    var showExportPicker by rememberSaveable { mutableStateOf(false) }
-
-    // Restore runs the picked file through the normal .ics import flow.
-    val openBackup = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.OpenDocument(),
-    ) { uri -> uri?.let(onImport) }
-
-    // The VM persists the write grant so background runs can keep writing.
-    val pickFolder = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.OpenDocumentTree(),
-    ) { uri -> uri?.let(viewModel::setAutoBackupFolder) }
-    var showInterval by remember { mutableStateOf(false) }
-
-    val backupFailedText = stringResource(R.string.calendars_backup_failed)
-    LaunchedEffect(backupResult) {
-        when (val r = backupResult) {
-            is BackupResult.Success -> {
-                snackbarHostState.showSnackbar(
-                    context.resources.getQuantityString(
-                        R.plurals.calendars_backup_done, r.eventCount, r.eventCount,
-                    ),
-                )
-                viewModel.consumeBackupResult()
-            }
-            BackupResult.Failure -> {
-                snackbarHostState.showSnackbar(backupFailedText)
-                viewModel.consumeBackupResult()
-            }
-            null -> Unit
-        }
-    }
-
-    CollapsingScaffold(
-        title = stringResource(R.string.settings_section_backup),
-        onBack = onBack,
-        snackbarHost = { SnackbarHost(snackbarHostState) },
-        predictiveBack = true,
-    ) {
-        HintText(stringResource(R.string.calendars_backup_hint))
-
-        if (exportable.isNotEmpty()) {
-            GroupedRow(
-                title = stringResource(R.string.calendars_backup_action),
-                position = Position.Top,
-                leading = { LeadingAvatar(Icons.Default.FileDownload) },
-                onClick = {
-                    // A single exportable calendar skips the selector.
-                    if (exportable.size == 1) {
-                        runCatching { createBackup.launch("calendula-backup-${LocalDate.now()}.ics") }
-                    } else {
-                        showExportPicker = true
-                    }
-                },
-            )
-            GroupedRow(
-                title = stringResource(R.string.calendars_restore_action),
-                summary = stringResource(R.string.calendars_restore_hint),
-                position = Position.Middle,
-                leading = { LeadingAvatar(Icons.Default.FileUpload) },
-                onClick = { runCatching { openBackup.launch(RESTORE_MIME_TYPES) } },
-            )
-            GroupedRow(
-                title = stringResource(R.string.calendars_auto_backup),
-                summary = stringResource(R.string.calendars_auto_backup_hint),
-                position = if (autoBackup.enabled) Position.Middle else Position.Bottom,
-                leading = { LeadingAvatar(Icons.Default.Schedule) },
-                trailing = {
-                    Switch(checked = autoBackup.enabled, onCheckedChange = viewModel::setAutoBackupEnabled)
-                },
-                onClick = { viewModel.setAutoBackupEnabled(!autoBackup.enabled) },
-            )
-            if (autoBackup.enabled) {
-                GroupedRow(
-                    title = stringResource(R.string.calendars_auto_backup_folder),
-                    summary = rememberFolderName(autoBackup.folderUri)
-                        ?: stringResource(R.string.calendars_auto_backup_folder_unset),
-                    position = Position.Middle,
-                    onClick = { runCatching { pickFolder.launch(null) } },
-                )
-                GroupedRow(
-                    title = stringResource(R.string.calendars_auto_backup_interval),
-                    summary = backupIntervalLabel(autoBackup.intervalMinutes),
-                    position = Position.Bottom,
-                    onClick = { showInterval = true },
-                )
-                HintText(backupStatusText(autoBackup.status))
-            }
-        } else if (canImport) {
-            // Nothing to back up, but restore is still possible — don't hide
-            // it behind export eligibility.
-            SectionHeader(stringResource(R.string.calendars_restore_header))
-            HintText(stringResource(R.string.calendars_restore_hint))
-            GroupedRow(
-                title = stringResource(R.string.calendars_restore_action),
-                position = Position.Alone,
-                leading = { LeadingAvatar(Icons.Default.FileUpload) },
-                onClick = { runCatching { openBackup.launch(RESTORE_MIME_TYPES) } },
-            )
-        }
-    }
-
-    if (showExportPicker) {
-        ExportCalendarPicker(
-            calendars = exportable,
-            onExport = viewModel::exportBackup,
-            onDismiss = { showExportPicker = false },
-        )
-    }
-    if (showInterval) {
-        BackupIntervalDialog(
-            currentMinutes = autoBackup.intervalMinutes,
-            onConfirm = viewModel::setAutoBackupIntervalMinutes,
-            onDismiss = { showInterval = false },
-        )
-    }
-}
-
-/**
- * Choose which local calendars to include in a one-time `.ics` export. Defaults
- * to all selected; the Export action opens the SAF save dialog and hands back
- * the picked file with the chosen calendar ids.
- */
-@Composable
-private fun ExportCalendarPicker(
-    calendars: List<CalendarSource>,
-    onExport: (Uri, Set<Long>?) -> Unit,
-    onDismiss: () -> Unit,
-) {
-    // Deliberately not keyed on [calendars]: that list is observer-driven, so
-    // keying it would reset the user's de-selections on every provider re-emit.
-    var selected by rememberSaveable(
-        stateSaver = listSaver(
-            save = { it.toList() },
-            restore = { it.toSet() },
-        ),
-    ) {
-        mutableStateOf(calendars.map { it.id }.toSet())
-    }
-    val createBackup = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.CreateDocument("text/calendar"),
-    ) { uri ->
-        if (uri != null) {
-            onExport(uri, selected)
-            onDismiss()
-        }
-    }
-
-    FullScreenPicker(
-        title = stringResource(R.string.calendars_export_title),
-        onDismiss = onDismiss,
-    ) {
-        HintText(stringResource(R.string.calendars_export_hint))
-        calendars.forEachIndexed { index, calendar ->
-            val isSelected = calendar.id in selected
-            GroupedRow(
-                title = calendar.displayName,
-                summary = calendar.description,
-                position = positionOf(index, calendars.size),
-                leading = { CalendarColorChip(calendar.color) },
-                trailing = {
-                    Checkbox(
-                        checked = isSelected,
-                        onCheckedChange = { checked ->
-                            selected = if (checked) selected + calendar.id else selected - calendar.id
-                        },
-                    )
-                },
-                onClick = {
-                    selected = if (isSelected) selected - calendar.id else selected + calendar.id
-                },
-            )
-        }
-        Button(
-            onClick = {
-                runCatching { createBackup.launch("calendula-backup-${LocalDate.now()}.ics") }
-            },
-            enabled = selected.isNotEmpty(),
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp, vertical = 16.dp),
-        ) {
-            Text(stringResource(R.string.calendars_export_action))
-        }
-    }
-}
-
-/** Readable name of the persisted backup folder, resolved from its tree Uri. */
-@Composable
-private fun rememberFolderName(uriString: String?): String? {
-    val context = LocalContext.current
-    return remember(uriString) {
-        uriString?.let {
-            runCatching { DocumentFile.fromTreeUri(context, it.toUri())?.name }.getOrNull()
-        }
-    }
-}
-
-/** "Every 30 minutes" / "Every 2 hours" / "Every day" — the interval in its largest whole unit. */
-@Composable
-private fun backupIntervalLabel(minutes: Long): String {
-    val duration = when {
-        minutes % MINUTES_PER_WEEK == 0L ->
-            pluralStringResource(R.plurals.duration_weeks, (minutes / MINUTES_PER_WEEK).toInt(), (minutes / MINUTES_PER_WEEK).toInt())
-        minutes % MINUTES_PER_DAY == 0L ->
-            pluralStringResource(R.plurals.duration_days, (minutes / MINUTES_PER_DAY).toInt(), (minutes / MINUTES_PER_DAY).toInt())
-        minutes % 60L == 0L ->
-            pluralStringResource(R.plurals.duration_hours, (minutes / 60L).toInt(), (minutes / 60L).toInt())
-        else ->
-            pluralStringResource(R.plurals.duration_minutes, minutes.toInt(), minutes.toInt())
-    }
-    return stringResource(R.string.calendars_auto_backup_every, duration)
-}
-
-/** "Last backup: 5 minutes ago" / "… failed" / "No automatic backup yet". */
-@Composable
-private fun backupStatusText(status: BackupStatus): String {
-    if (status.lastRun == 0L) return stringResource(R.string.calendars_auto_backup_status_never)
-    val relative = DateUtils.getRelativeTimeSpanString(
-        status.lastRun, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS,
-    ).toString()
-    return if (status.lastSuccess) {
-        stringResource(R.string.calendars_auto_backup_status_ok, relative)
-    } else {
-        stringResource(R.string.calendars_auto_backup_status_failed, relative)
-    }
-}
-
-/** Amount + unit picker for the backup interval (floored at 30 minutes). */
-@Composable
-private fun BackupIntervalDialog(
-    currentMinutes: Long,
-    onConfirm: (Long) -> Unit,
-    onDismiss: () -> Unit,
-) {
-    // Pick the largest unit the current value divides into.
-    val unitMinutes = remember { listOf(1L, 60L, MINUTES_PER_DAY, MINUTES_PER_WEEK) }
-    val units = stringArrayResource(R.array.backup_interval_units).toList()
-    val initialUnit = unitMinutes.indexOfLast { currentMinutes % it == 0L }.coerceAtLeast(0)
-    var amount by rememberSaveable { mutableStateOf((currentMinutes / unitMinutes[initialUnit]).toString()) }
-    var unitIndex by rememberSaveable { mutableStateOf(initialUnit) }
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(stringResource(R.string.calendars_auto_backup_interval)) },
-        text = {
-            Column {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    DialogAmountField(value = amount, onValueChange = { amount = it }, placeholder = "1")
-                    Spacer(Modifier.width(12.dp))
-                    DialogUnitDropdown(label = units[unitIndex], entries = units) { unitIndex = it }
-                }
-                Spacer(Modifier.height(8.dp))
-                Text(
-                    text = stringResource(R.string.calendars_auto_backup_interval_min),
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = {
-                val value = amount.toLongOrNull()?.coerceAtLeast(1L) ?: 1L
-                onConfirm((value * unitMinutes[unitIndex]).coerceAtLeast(SettingsPrefs.MIN_BACKUP_INTERVAL))
-                onDismiss()
-            }) { Text(stringResource(R.string.reminder_custom_set)) }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
-}
-
-private const val MINUTES_PER_DAY = 1_440L
-private const val MINUTES_PER_WEEK = 10_080L

app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarVisibilityNotice.kt

@@ -1,71 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.calendars
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.data.calendar.CalendarVisibilityReconciler
-import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-/**
- * The one-time notice that Calendula now follows the device's per-calendar
- * visibility (#75), armed by `CalendarVisibilityReconciler`. The app does not
- * switch those calendars back on — that would un-hide them everywhere else too.
- */
-@HiltViewModel
-class CalendarVisibilityNoticeViewModel @Inject constructor(
-    private val prefs: CalendarPrefs,
-    private val reconciler: CalendarVisibilityReconciler,
-) : ViewModel() {
-
-    /**
-     * Reconcile whenever the app comes up with the calendar permission held,
-     * rather than off one grant route: a permission granted on Android's
-     * app-settings screen never reaches the permission screen's callback.
-     */
-    fun reconcile() {
-        viewModelScope.launch { reconciler.run() }
-    }
-
-    val pending: StateFlow<Boolean> = prefs.visibilityNoticePending
-        .map { it == true }
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = false,
-        )
-
-    fun dismiss() {
-        viewModelScope.launch { prefs.setVisibilityNoticePending(false) }
-    }
-}
-
-/** Plain informational dialog — one acknowledgement, nothing to decide. */
-@Composable
-fun CalendarVisibilityNoticeDialog(onDismiss: () -> Unit) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        icon = { Icon(Icons.Default.VisibilityOff, contentDescription = null) },
-        title = { Text(stringResource(R.string.calendars_visibility_notice_title)) },
-        text = { Text(stringResource(R.string.calendars_visibility_notice_message)) },
-        confirmButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.dialog_ok))
-            }
-        },
-    )
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt

@@ -4,6 +4,9 @@ import android.accounts.AccountManager
 import android.content.Context
 import android.content.Intent
 import android.provider.Settings
+import android.text.format.DateUtils
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -23,22 +26,25 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.Notes
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Backup
 import androidx.compose.material.icons.filled.CalendarMonth
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Cloud
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.FileDownload
+import androidx.compose.material.icons.filled.FileUpload
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.PhoneAndroid
+import androidx.compose.material.icons.filled.Schedule
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -60,69 +66,83 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import de.jeanlucmakiola.calendula.R
+import de.jeanlucmakiola.calendula.data.prefs.BackupStatus
+import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
 import de.jeanlucmakiola.calendula.domain.CalendarSource
-import de.jeanlucmakiola.calendula.domain.CalendarStateLabel
-import de.jeanlucmakiola.calendula.domain.hasVisibilitySwitch
-import de.jeanlucmakiola.calendula.domain.isNotSynced
-import de.jeanlucmakiola.calendula.domain.orderedForManager
-import de.jeanlucmakiola.calendula.domain.stateLabels
 import de.jeanlucmakiola.calendula.data.calendar.CalendarColorPalette
-import de.jeanlucmakiola.calendula.ui.common.AccountKey
 import de.jeanlucmakiola.calendula.ui.common.CalendarColorChip
-import de.jeanlucmakiola.calendula.ui.common.accountGroupTitle
-import de.jeanlucmakiola.calendula.ui.common.groupByAccount
 import de.jeanlucmakiola.calendula.ui.common.LocalSoftenColors
-import de.jeanlucmakiola.calendula.ui.common.eventAccent
 import de.jeanlucmakiola.calendula.ui.common.eventFill
 import de.jeanlucmakiola.calendula.ui.common.LeadingAvatar
 import de.jeanlucmakiola.calendula.ui.common.SourceLogo
 import de.jeanlucmakiola.calendula.ui.common.curatedSourcePackage
 import de.jeanlucmakiola.floret.components.CollapsingScaffold
+import de.jeanlucmakiola.floret.components.DialogAmountField
+import de.jeanlucmakiola.floret.components.DialogUnitDropdown
+import de.jeanlucmakiola.floret.components.FullScreenPicker
+import de.jeanlucmakiola.floret.components.positionOf
 import de.jeanlucmakiola.floret.identity.collapseExit
 import de.jeanlucmakiola.floret.identity.expandEnter
 import de.jeanlucmakiola.floret.identity.predictiveBack
 import de.jeanlucmakiola.calendula.ui.common.ColorSwatchRow
-import de.jeanlucmakiola.floret.components.GroupedListInset
 import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.floret.components.InlineTextField
 import de.jeanlucmakiola.floret.components.Position
+import java.time.LocalDate
 
 /** Sentinel [editorId] meaning "the editor is composing a new calendar". */
 private const val NEW_CALENDAR_ID = Long.MIN_VALUE
 
+// SAF mime filter for the restore picker. `.ics` files reach us under several
+// mimes depending on the source app (our own export uses text/calendar; others
+// hand them out as octet-stream or text/plain), so accept the common set rather
+// than hide valid backups behind an over-tight filter.
+private val RESTORE_MIME_TYPES = arrayOf(
+    "text/calendar",
+    "application/octet-stream",
+    "text/plain",
+)
+
 /**
  * Calendar manager (reached from Settings). Lists the app's own device-only
- * calendars with create / rename / recolor / delete, and synced calendars
+ * calendars with create / rename / recolor / delete (via a full-screen editor),
- * read-only with a per-account "manage in the source app" deep-link.
+ * and lists synced calendars read-only with a per-account "manage in the source
- *
+ * app" deep-link — the app never touches a synced calendar's server. A
- * Export/import lives in its own Settings entry ([BackupScreen], #69); this
+ * full-screen destination; [onBack] pops it.
- * screen only points at it. [onBack] pops the destination.
  */
 @Composable
 fun CalendarsScreen(
     onBack: () -> Unit,
-    onOpenBackup: () -> Unit,
+    onImport: (android.net.Uri) -> Unit,
     viewModel: CalendarsViewModel = hiltViewModel(),
 ) {
     val calendars by viewModel.calendars.collectAsStateWithLifecycle()
-    val deleteLockedIds by viewModel.deleteLockedCalendarIds.collectAsStateWithLifecycle()
+    val disabledIds by viewModel.disabledCalendarIds.collectAsStateWithLifecycle()
     val error by viewModel.error.collectAsStateWithLifecycle()
+    val backupResult by viewModel.backupResult.collectAsStateWithLifecycle()
+    val autoBackup by viewModel.autoBackup.collectAsStateWithLifecycle()
 
     // null = list; NEW_CALENDAR_ID = create; any other id = edit that calendar.
     // [editorSession] bumps on every open so the editor's field state resets for
@@ -138,7 +158,6 @@ fun CalendarsScreen(
             initialName = editing?.displayName.orEmpty(),
             initialColor = editing?.color ?: CalendarColorPalette.all.first(),
             initialDescription = editing?.description.orEmpty(),
-            deleteLocked = editing != null && editing.id in deleteLockedIds,
             onSave = { name, color, description ->
                 val id = editorId
                 if (id == null || id == NEW_CALENDAR_ID) {
@@ -158,14 +177,22 @@ fun CalendarsScreen(
         CalendarsList(
             local = calendars.filter { it.isLocal },
             synced = calendars.filterNot { it.isLocal },
+            disabledIds = disabledIds,
             error = error,
             onConsumeError = viewModel::consumeError,
-            onOpenBackup = onOpenBackup,
+            backupResult = backupResult,
+            onExportBackup = viewModel::exportBackup,
+            onImport = onImport,
+            onConsumeBackupResult = viewModel::consumeBackupResult,
+            autoBackup = autoBackup,
+            onSetAutoBackupEnabled = viewModel::setAutoBackupEnabled,
+            onSetAutoBackupInterval = viewModel::setAutoBackupIntervalMinutes,
+            onSetAutoBackupFolder = viewModel::setAutoBackupFolder,
             onBack = onBack,
             onAdd = { editorSession++; editorId = NEW_CALENDAR_ID },
             onEdit = { calendar -> editorSession++; editorId = calendar.id },
-            onSetVisible = viewModel::setCalendarVisible,
+            onSetDisabled = viewModel::setDisabled,
-            onSetAccountVisible = viewModel::setAccountVisible,
+            onSetAccountDisabled = viewModel::setAccountDisabled,
         )
     }
 }
@@ -174,20 +201,28 @@ fun CalendarsScreen(
 private fun CalendarsList(
     local: List<CalendarSource>,
     synced: List<CalendarSource>,
+    disabledIds: Set<Long>,
     error: Boolean,
     onConsumeError: () -> Unit,
-    onOpenBackup: () -> Unit,
+    backupResult: BackupResult?,
+    onExportBackup: (android.net.Uri, Set<Long>?) -> Unit,
+    onImport: (android.net.Uri) -> Unit,
+    onConsumeBackupResult: () -> Unit,
+    autoBackup: AutoBackupUiState,
+    onSetAutoBackupEnabled: (Boolean) -> Unit,
+    onSetAutoBackupInterval: (Long) -> Unit,
+    onSetAutoBackupFolder: (android.net.Uri) -> Unit,
     onBack: () -> Unit,
     onAdd: () -> Unit,
     onEdit: (CalendarSource) -> Unit,
-    onSetVisible: (Long, Boolean) -> Unit,
+    onSetDisabled: (Long, Boolean) -> Unit,
-    onSetAccountVisible: (Collection<Long>, Boolean) -> Unit,
+    onSetAccountDisabled: (Collection<Long>, Boolean) -> Unit,
 ) {
     val context = LocalContext.current
     val snackbarHostState = remember { SnackbarHostState() }
     // Accounts the user has folded shut; empty = all expanded (keeps every
     // calendar visible by default, the section is collapsible for tidiness).
-    var collapsedAccounts by remember { mutableStateOf(emptySet<AccountKey>()) }
+    var collapsedAccounts by remember { mutableStateOf(emptySet<String>()) }
     var localExpanded by remember { mutableStateOf(true) }
     val writeErrorText = stringResource(R.string.calendars_write_error)
 
@@ -198,6 +233,47 @@ private fun CalendarsList(
         }
     }
 
+    // SAF "create document" target for the backup file. The picked Uri is handed
+    // to the VM to stream the .ics into. This launcher exports everything
+    // eligible (null); the per-calendar selector owns its own launcher.
+    val createBackup = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.CreateDocument("text/calendar"),
+    ) { uri -> uri?.let { onExportBackup(it, null) } }
+    var showExportPicker by rememberSaveable { mutableStateOf(false) }
+
+    // SAF "open document" picker for restoring events from a .ics file. The
+    // picked Uri is handed up to the host, which runs it through the same import
+    // flow as an externally opened .ics (parse, dedup by UID, target picker).
+    val openBackup = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.OpenDocument(),
+    ) { uri -> uri?.let(onImport) }
+
+    // SAF folder picker for the automatic-backup destination; the VM persists the
+    // write grant so background runs can keep writing to it.
+    val pickFolder = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.OpenDocumentTree(),
+    ) { uri -> uri?.let(onSetAutoBackupFolder) }
+    var showInterval by remember { mutableStateOf(false) }
+
+    val backupFailedText = stringResource(R.string.calendars_backup_failed)
+    LaunchedEffect(backupResult) {
+        when (val r = backupResult) {
+            is BackupResult.Success -> {
+                snackbarHostState.showSnackbar(
+                    context.resources.getQuantityString(
+                        R.plurals.calendars_backup_done, r.eventCount, r.eventCount,
+                    ),
+                )
+                onConsumeBackupResult()
+            }
+            BackupResult.Failure -> {
+                snackbarHostState.showSnackbar(backupFailedText)
+                onConsumeBackupResult()
+            }
+            null -> Unit
+        }
+    }
+
     CollapsingScaffold(
         title = stringResource(R.string.calendars_title),
         onBack = onBack,
@@ -205,12 +281,12 @@ private fun CalendarsList(
         predictiveBack = true,
     ) {
         // What the per-calendar / per-account switches below actually do.
-        HintText(stringResource(R.string.calendars_visibility_hint))
+        HintText(stringResource(R.string.calendars_disable_hint))
 
         // Local (device-only) calendars — one collapsible group. The header's
         // "+" adds a calendar; the switch enables/disables them all at once;
         // tapping a calendar row opens its editor.
-        val localDisabled = local.isNotEmpty() && local.none { it.isVisibleInSystem }
+        val localDisabled = local.isNotEmpty() && local.all { it.id in disabledIds }
         CalendarGroup(
             title = stringResource(R.string.calendars_local_header),
             expanded = localExpanded,
@@ -222,17 +298,17 @@ private fun CalendarsList(
             onManage = onAdd,
             onToggleExpand = { localExpanded = !localExpanded },
             showToggleAll = local.isNotEmpty(),
-            allEnabled = local.all { it.isVisibleInSystem },
+            allEnabled = local.none { it.id in disabledIds },
-            onToggleAll = { enabled -> onSetAccountVisible(local.map { it.id }, enabled) },
+            onToggleAll = { enabled -> onSetAccountDisabled(local.map { it.id }, !enabled) },
         ) {
             if (local.isEmpty()) {
                 HintText(stringResource(R.string.calendars_local_empty))
             } else {
                 local.forEachIndexed { index, calendar ->
-                    val disabled = !calendar.isVisibleInSystem
+                    val disabled = calendar.id in disabledIds
                     GroupedRow(
                         title = calendar.displayName,
-                        summary = calendarRowSummary(calendar),
+                        summary = calendar.description,
                         position = if (index == local.lastIndex) Position.Bottom else Position.Middle,
                         container = MaterialTheme.colorScheme.surfaceContainerHighest,
                         dimmed = disabled,
@@ -241,7 +317,7 @@ private fun CalendarsList(
                             EnableSwitch(
                                 calendarName = calendar.displayName,
                                 enabled = !disabled,
-                                onToggle = { enabled -> onSetVisible(calendar.id, enabled) },
+                                onToggle = { enabled -> onSetDisabled(calendar.id, !enabled) },
                             )
                         },
                         onClick = { onEdit(calendar) },
@@ -250,22 +326,82 @@ private fun CalendarsList(
             }
         }
 
-        // Pointer to the Backup entry (#69), so it stays findable from here.
+        // Backup — local calendars have no sync, so a .ics export is their only
+        // safety net. Offered only when there is something exportable: the user's
+        // own local calendars (managed special-dates mirrors don't count).
+        val exportable = local.filter { it.canModifyContents && !it.isManaged }
+        // Restore/import can target any writable, non-managed calendar (local or
+        // synced), so its availability is broader than export's.
+        val canImport = (local + synced).any { it.canModifyContents && !it.isManaged }
+        if (exportable.isNotEmpty()) {
             Spacer(Modifier.height(16.dp))
+            SectionHeader(stringResource(R.string.calendars_backup_header))
+            HintText(stringResource(R.string.calendars_backup_hint))
+            // One connected card: the one-time export on top, then automatic
+            // backup (and its folder/interval rows when on).
             GroupedRow(
-            title = stringResource(R.string.settings_section_backup),
+                title = stringResource(R.string.calendars_backup_action),
-            summary = stringResource(R.string.settings_backup_subtitle),
+                position = Position.Top,
-            position = Position.Alone,
+                leading = { LeadingAvatar(Icons.Default.FileDownload) },
-            leading = { LeadingAvatar(Icons.Default.Backup) },
+                onClick = {
-            trailing = {
+                    // With more than one exportable calendar, let the user choose
-                Icon(
+                    // which to include; a single one exports straight away.
-                    imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                    if (exportable.size == 1) {
-                    contentDescription = null,
+                        runCatching { createBackup.launch("calendula-backup-${LocalDate.now()}.ics") }
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    } else {
-                )
+                        showExportPicker = true
+                    }
                 },
-            onClick = onOpenBackup,
             )
+            GroupedRow(
+                title = stringResource(R.string.calendars_restore_action),
+                summary = stringResource(R.string.calendars_restore_hint),
+                position = Position.Middle,
+                leading = { LeadingAvatar(Icons.Default.FileUpload) },
+                onClick = {
+                    runCatching { openBackup.launch(RESTORE_MIME_TYPES) }
+                },
+            )
+            GroupedRow(
+                title = stringResource(R.string.calendars_auto_backup),
+                summary = stringResource(R.string.calendars_auto_backup_hint),
+                position = if (autoBackup.enabled) Position.Middle else Position.Bottom,
+                leading = { LeadingAvatar(Icons.Default.Schedule) },
+                trailing = {
+                    Switch(checked = autoBackup.enabled, onCheckedChange = onSetAutoBackupEnabled)
+                },
+                onClick = { onSetAutoBackupEnabled(!autoBackup.enabled) },
+            )
+            if (autoBackup.enabled) {
+                GroupedRow(
+                    title = stringResource(R.string.calendars_auto_backup_folder),
+                    summary = rememberFolderName(autoBackup.folderUri)
+                        ?: stringResource(R.string.calendars_auto_backup_folder_unset),
+                    position = Position.Middle,
+                    onClick = { runCatching { pickFolder.launch(null) } },
+                )
+                GroupedRow(
+                    title = stringResource(R.string.calendars_auto_backup_interval),
+                    summary = backupIntervalLabel(autoBackup.intervalMinutes),
+                    position = Position.Bottom,
+                    onClick = { showInterval = true },
+                )
+                HintText(backupStatusText(autoBackup.status))
+            }
+        } else if (canImport) {
+            // Nothing to back up (no writable local calendar), but events can
+            // still be restored into a writable calendar — offer restore on its
+            // own so it isn't hidden behind export eligibility.
+            Spacer(Modifier.height(16.dp))
+            SectionHeader(stringResource(R.string.calendars_restore_header))
+            HintText(stringResource(R.string.calendars_restore_hint))
+            GroupedRow(
+                title = stringResource(R.string.calendars_restore_action),
+                position = Position.Alone,
+                leading = { LeadingAvatar(Icons.Default.FileUpload) },
+                onClick = { runCatching { openBackup.launch(RESTORE_MIME_TYPES) } },
+            )
+        }
 
         Spacer(Modifier.height(16.dp))
 
@@ -275,19 +411,14 @@ private fun CalendarsList(
         SectionHeader(stringResource(R.string.calendars_synced_header))
         HintText(stringResource(R.string.calendars_synced_hint))
         synced
-            .groupByAccount()
+            .groupBy { it.accountName.ifBlank { it.accountType } }
-            .forEach { group ->
+            .forEach { (account, cals) ->
-                val cals = group.calendars
+                val expanded = account !in collapsedAccounts
-                val expanded = group.key !in collapsedAccounts
+                val accountType = cals.first().accountType
-                val accountType = group.accountType
+                val accountDisabled = cals.all { it.id in disabledIds }
-                // A non-syncing calendar has no switch, so it neither counts
-                // towards "the whole account is off" nor moves with toggle-all.
-                val switchable = cals.filter { it.hasVisibilitySwitch }
-                val accountDisabled = switchable.isNotEmpty() &&
-                    switchable.none { it.isVisibleInSystem }
                 Spacer(Modifier.height(16.dp))
                 CalendarGroup(
-                    title = accountGroupTitle(group),
+                    title = account,
                     expanded = expanded,
                     bodyHasRows = true,
                     headerDisabled = accountDisabled,
@@ -299,41 +430,29 @@ private fun CalendarsList(
                     },
                     onToggleExpand = {
                         collapsedAccounts = if (expanded) {
-                            collapsedAccounts + group.key
+                            collapsedAccounts + account
                         } else {
-                            collapsedAccounts - group.key
+                            collapsedAccounts - account
                         }
                     },
-                    showToggleAll = switchable.isNotEmpty(),
+                    showToggleAll = true,
-                    allEnabled = switchable.all { it.isVisibleInSystem },
+                    allEnabled = cals.none { it.id in disabledIds },
-                    onToggleAll = { enabled ->
+                    onToggleAll = { enabled -> onSetAccountDisabled(cals.map { it.id }, !enabled) },
-                        onSetAccountVisible(switchable.map { it.id }, enabled)
-                    },
                 ) {
-                    // Actionable calendars first; non-syncing ones at the
+                    cals.forEachIndexed { index, calendar ->
-                    // bottom, dimmed and switchless.
+                        val disabled = calendar.id in disabledIds
-                    val ordered = cals.orderedForManager()
-                    ordered.forEachIndexed { index, calendar ->
-                        val disabled = !calendar.isVisibleInSystem || calendar.isNotSynced
                         GroupedRow(
                             title = calendar.displayName,
-                            summary = calendarRowSummary(calendar),
+                            position = if (index == cals.lastIndex) Position.Bottom else Position.Middle,
-                            position = if (index == ordered.lastIndex) Position.Bottom else Position.Middle,
                             container = MaterialTheme.colorScheme.surfaceContainerHighest,
                             dimmed = disabled,
                             leading = { CalendarColorChip(calendar.color, dimIf(disabled)) },
-                            trailing = if (calendar.hasVisibilitySwitch) {
+                            trailing = {
-                                {
                                 EnableSwitch(
                                     calendarName = calendar.displayName,
-                                        enabled = calendar.isVisibleInSystem,
+                                    enabled = !disabled,
-                                        onToggle = { enabled ->
+                                    onToggle = { enabled -> onSetDisabled(calendar.id, !enabled) },
-                                            onSetVisible(calendar.id, enabled)
-                                        },
                                 )
-                                }
-                            } else {
-                                null
                             },
                         )
                     }
@@ -341,6 +460,93 @@ private fun CalendarsList(
             }
     }
 
+    if (showInterval) {
+        BackupIntervalDialog(
+            currentMinutes = autoBackup.intervalMinutes,
+            onConfirm = onSetAutoBackupInterval,
+            onDismiss = { showInterval = false },
+        )
+    }
+
+    if (showExportPicker) {
+        ExportCalendarPicker(
+            calendars = local.filter { it.canModifyContents && !it.isManaged },
+            onExport = onExportBackup,
+            onDismiss = { showExportPicker = false },
+        )
+    }
+}
+
+/**
+ * Choose which local calendars to include in a one-time `.ics` export. Defaults
+ * to all selected; the Export action opens the SAF save dialog and hands back
+ * the picked file with the chosen calendar ids.
+ */
+@Composable
+private fun ExportCalendarPicker(
+    calendars: List<CalendarSource>,
+    onExport: (android.net.Uri, Set<Long>?) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    // Seed once with everything selected and hold it across recomposition and
+    // rotation. NOT keyed on [calendars]: the list is observer-driven, so keying
+    // it would silently reset the user's de-selections whenever the provider
+    // re-emits (a background sync, a recolor). Ids that later vanish are harmless
+    // — the data layer intersects the chosen set with the eligible calendars.
+    var selected by rememberSaveable(
+        stateSaver = listSaver(
+            save = { it.toList() },
+            restore = { it.toSet() },
+        ),
+    ) {
+        mutableStateOf(calendars.map { it.id }.toSet())
+    }
+    val createBackup = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.CreateDocument("text/calendar"),
+    ) { uri ->
+        if (uri != null) {
+            onExport(uri, selected)
+            onDismiss()
+        }
+    }
+
+    FullScreenPicker(
+        title = stringResource(R.string.calendars_export_title),
+        onDismiss = onDismiss,
+    ) {
+        HintText(stringResource(R.string.calendars_export_hint))
+        calendars.forEachIndexed { index, calendar ->
+            val isSelected = calendar.id in selected
+            GroupedRow(
+                title = calendar.displayName,
+                summary = calendar.description,
+                position = positionOf(index, calendars.size),
+                leading = { CalendarColorChip(calendar.color) },
+                trailing = {
+                    Checkbox(
+                        checked = isSelected,
+                        onCheckedChange = { checked ->
+                            selected = if (checked) selected + calendar.id else selected - calendar.id
+                        },
+                    )
+                },
+                onClick = {
+                    selected = if (isSelected) selected - calendar.id else selected + calendar.id
+                },
+            )
+        }
+        Button(
+            onClick = {
+                runCatching { createBackup.launch("calendula-backup-${LocalDate.now()}.ics") }
+            },
+            enabled = selected.isNotEmpty(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+        ) {
+            Text(stringResource(R.string.calendars_export_action))
+        }
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -354,7 +560,6 @@ private fun CalendarEditor(
     onSave: (name: String, color: Int, description: String?) -> Unit,
     onDelete: () -> Unit,
     onClose: () -> Unit,
-    deleteLocked: Boolean = false,
 ) {
     var name by rememberSaveable(sessionKey) { mutableStateOf(initialName) }
     var color by rememberSaveable(sessionKey) { mutableStateOf(initialColor) }
@@ -388,20 +593,11 @@ private fun CalendarEditor(
                 },
                 actions = {
                     if (!isNew) {
-                        // Disabled rather than hidden while the special-dates
+                        IconButton(onClick = { confirmDelete = true }) {
-                        // sync owns this calendar; the card below says why.
-                        IconButton(
-                            onClick = { confirmDelete = true },
-                            enabled = !deleteLocked,
-                        ) {
                             Icon(
                                 Icons.Default.Delete,
                                 contentDescription = stringResource(R.string.event_detail_delete),
-                                tint = if (deleteLocked) {
+                                tint = MaterialTheme.colorScheme.error,
-                                    MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
-                                } else {
-                                    MaterialTheme.colorScheme.error
-                                },
                             )
                         }
                     }
@@ -430,20 +626,7 @@ private fun CalendarEditor(
                 .padding(horizontal = 16.dp, vertical = 8.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
         ) {
-            if (deleteLocked) {
+            EditorCard(icon = Icons.Default.CalendarMonth, iconTint = eventFill(color, dark, soften)) {
-                EditorCard(
-                    icon = Icons.Default.Info,
-                    iconTint = MaterialTheme.colorScheme.onSurfaceVariant,
-                    iconAtTop = true,
-                ) {
-                    Text(
-                        text = stringResource(R.string.calendars_managed_delete_locked),
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-            EditorCard(icon = Icons.Default.CalendarMonth, iconTint = eventAccent(color, dark, soften)) {
                 InlineTextField(
                     value = name,
                     onValueChange = { name = it },
@@ -515,28 +698,10 @@ private fun CalendarEditor(
 }
 
 /**
- * The row's supporting line: the states that make this calendar behave unlike a
+ * The per-row enable/disable control. Checked = the calendar is shown in the
- * plain writable one (#76), then its own description.
+ * app; unchecking disables it (events, filters and pickers all drop it) without
- */
+ * touching any provider data. Carries its own content description so the toggle
-@Composable
+ * is self-describing to screen readers even on a dimmed row.
-private fun calendarRowSummary(calendar: CalendarSource): String? {
-    val states = calendar.stateLabels().map { label ->
-        stringResource(
-            when (label) {
-                CalendarStateLabel.MANAGED -> R.string.calendars_state_managed
-                CalendarStateLabel.READ_ONLY -> R.string.calendars_state_read_only
-                CalendarStateLabel.NOT_SYNCED -> R.string.calendars_state_not_synced
-            },
-        )
-    }
-    val parts = states + listOfNotNull(calendar.description?.takeIf { it.isNotBlank() })
-    return parts.joinToString(" · ").ifEmpty { null }
-}
-
-/**
- * The per-row on/off control, writing the system's device-local
- * `Calendars.VISIBLE`. Unchecked drops the calendar out of every surface and
- * stops its reminders. Carries its own content description.
  */
 @Composable
 private fun EnableSwitch(
@@ -544,7 +709,7 @@ private fun EnableSwitch(
     enabled: Boolean,
     onToggle: (Boolean) -> Unit,
 ) {
-    val label = stringResource(R.string.calendars_visibility_a11y, calendarName)
+    val label = stringResource(R.string.calendars_show_in_app_a11y, calendarName)
     Switch(
         checked = enabled,
         onCheckedChange = onToggle,
@@ -718,31 +883,113 @@ private fun CalendarGroupMenu(
 
 
 @Composable
-internal fun SectionHeader(text: String) {
+private fun SectionHeader(text: String) {
     Text(
         text = text,
         style = MaterialTheme.typography.labelLarge,
         color = MaterialTheme.colorScheme.primary,
-        // The cards' own edge, so header and group share a left margin.
+        modifier = Modifier.padding(start = 24.dp, end = 24.dp, top = 16.dp, bottom = 4.dp),
-        modifier = Modifier.padding(
-            start = GroupedListInset,
-            end = GroupedListInset,
-            top = 16.dp,
-            bottom = 4.dp,
-        ),
     )
 }
 
 @Composable
-internal fun HintText(text: String) {
+private fun HintText(text: String) {
     Text(
         text = text,
         style = MaterialTheme.typography.bodySmall,
         color = MaterialTheme.colorScheme.onSurfaceVariant,
-        modifier = Modifier.padding(horizontal = GroupedListInset, vertical = 4.dp),
+        modifier = Modifier.padding(horizontal = 24.dp, vertical = 4.dp),
     )
 }
 
+/** Readable name of the persisted backup folder, resolved from its tree Uri. */
+@Composable
+private fun rememberFolderName(uriString: String?): String? {
+    val context = LocalContext.current
+    return remember(uriString) {
+        uriString?.let {
+            runCatching { DocumentFile.fromTreeUri(context, it.toUri())?.name }.getOrNull()
+        }
+    }
+}
+
+/** "Every 30 minutes" / "Every 2 hours" / "Every day" — the interval in its largest whole unit. */
+@Composable
+private fun backupIntervalLabel(minutes: Long): String {
+    val duration = when {
+        minutes % MINUTES_PER_WEEK == 0L ->
+            pluralStringResource(R.plurals.duration_weeks, (minutes / MINUTES_PER_WEEK).toInt(), (minutes / MINUTES_PER_WEEK).toInt())
+        minutes % MINUTES_PER_DAY == 0L ->
+            pluralStringResource(R.plurals.duration_days, (minutes / MINUTES_PER_DAY).toInt(), (minutes / MINUTES_PER_DAY).toInt())
+        minutes % 60L == 0L ->
+            pluralStringResource(R.plurals.duration_hours, (minutes / 60L).toInt(), (minutes / 60L).toInt())
+        else ->
+            pluralStringResource(R.plurals.duration_minutes, minutes.toInt(), minutes.toInt())
+    }
+    return stringResource(R.string.calendars_auto_backup_every, duration)
+}
+
+/** "Last backup: 5 minutes ago" / "… failed" / "No automatic backup yet". */
+@Composable
+private fun backupStatusText(status: BackupStatus): String {
+    if (status.lastRun == 0L) return stringResource(R.string.calendars_auto_backup_status_never)
+    val relative = DateUtils.getRelativeTimeSpanString(
+        status.lastRun, System.currentTimeMillis(), DateUtils.MINUTE_IN_MILLIS,
+    ).toString()
+    return if (status.lastSuccess) {
+        stringResource(R.string.calendars_auto_backup_status_ok, relative)
+    } else {
+        stringResource(R.string.calendars_auto_backup_status_failed, relative)
+    }
+}
+
+/** Amount + unit picker for the backup interval (floored at 30 minutes). */
+@Composable
+private fun BackupIntervalDialog(
+    currentMinutes: Long,
+    onConfirm: (Long) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    // minutes-per-unit for each entry; pick the largest unit the current value divides into.
+    val unitMinutes = remember { listOf(1L, 60L, MINUTES_PER_DAY, MINUTES_PER_WEEK) }
+    val units = stringArrayResource(R.array.backup_interval_units).toList()
+    val initialUnit = unitMinutes.indexOfLast { currentMinutes % it == 0L }.coerceAtLeast(0)
+    var amount by rememberSaveable { mutableStateOf((currentMinutes / unitMinutes[initialUnit]).toString()) }
+    var unitIndex by rememberSaveable { mutableStateOf(initialUnit) }
+
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text(stringResource(R.string.calendars_auto_backup_interval)) },
+        text = {
+            Column {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    DialogAmountField(value = amount, onValueChange = { amount = it }, placeholder = "1")
+                    Spacer(Modifier.width(12.dp))
+                    DialogUnitDropdown(label = units[unitIndex], entries = units) { unitIndex = it }
+                }
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    text = stringResource(R.string.calendars_auto_backup_interval_min),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        },
+        confirmButton = {
+            TextButton(onClick = {
+                val value = amount.toLongOrNull()?.coerceAtLeast(1L) ?: 1L
+                onConfirm((value * unitMinutes[unitIndex]).coerceAtLeast(SettingsPrefs.MIN_BACKUP_INTERVAL))
+                onDismiss()
+            }) { Text(stringResource(R.string.reminder_custom_set)) }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
+        },
+    )
+}
+
+private const val MINUTES_PER_DAY = 1_440L
+private const val MINUTES_PER_WEEK = 10_080L
 
 /**
  * Pick the app to open for managing a synced calendar's account. The account's

app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsViewModel.kt

@@ -12,7 +12,10 @@ import de.jeanlucmakiola.calendula.data.calendar.CalendarRepository
 import de.jeanlucmakiola.calendula.data.di.IoDispatcher
 import de.jeanlucmakiola.calendula.data.ics.IcsExporter
 import de.jeanlucmakiola.calendula.data.prefs.BackupStatus
+import de.jeanlucmakiola.calendula.data.prefs.CalendarPrefs
 import de.jeanlucmakiola.calendula.data.prefs.SettingsPrefs
+import de.jeanlucmakiola.calendula.data.reminders.ReminderNotifier
+import de.jeanlucmakiola.calendula.data.reminders.SuppressedReminderStore
 import de.jeanlucmakiola.calendula.domain.CalendarSource
 import de.jeanlucmakiola.calendula.domain.ics.IcsWriter
 import kotlinx.coroutines.CoroutineDispatcher
@@ -42,7 +45,10 @@ class CalendarsViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
     private val repository: CalendarRepository,
     private val icsExporter: IcsExporter,
+    private val prefs: CalendarPrefs,
     private val settingsPrefs: SettingsPrefs,
+    private val suppressedStore: SuppressedReminderStore,
+    private val notifier: ReminderNotifier,
     @IoDispatcher private val io: CoroutineDispatcher,
 ) : ViewModel() {
 
@@ -56,6 +62,20 @@ class CalendarsViewModel @Inject constructor(
                 initialValue = emptyList(),
             )
 
+    /**
+     * Calendars the user has disabled in the app. This screen is the only
+     * surface that lists them, so it both reads the set (to dim the rows) and
+     * toggles it. Every other surface simply excludes these ids.
+     */
+    val disabledCalendarIds: StateFlow<Set<Long>> =
+        prefs.disabledCalendarIds
+            .flowOn(io)
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5_000L),
+                initialValue = emptySet(),
+            )
+
     /** Automatic-backup settings + last-run status, for the Backup section UI. */
     val autoBackup: StateFlow<AutoBackupUiState> = combine(
         settingsPrefs.autoBackupEnabled,
@@ -72,25 +92,6 @@ class CalendarsViewModel @Inject constructor(
             initialValue = AutoBackupUiState(),
         )
 
-    /**
-     * Managed special-dates calendars whose deletion would not stick: while the
-     * feature is on, `SpecialDatesSyncEngine.reconcileCalendars` undoes it on
-     * the next pass. Read off each calendar's durable [CalendarSource.isManaged]
-     * marker rather than the stored ids, which lag a sync pass behind.
-     */
-    val deleteLockedCalendarIds: StateFlow<Set<Long>> = combine(
-        calendars,
-        settingsPrefs.specialDatesEnabled,
-    ) { sources, enabled ->
-        if (!enabled) emptySet() else sources.filter { it.isManaged }.map { it.id }.toSet()
-    }
-        .flowOn(io)
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000L),
-            initialValue = emptySet(),
-        )
-
     private val _error = MutableStateFlow(false)
     val error: StateFlow<Boolean> = _error.asStateFlow()
 
@@ -139,21 +140,54 @@ class CalendarsViewModel @Inject constructor(
     }
 
     /**
-     * Switch a calendar on or off — the app's one visibility model, writing the
+     * Enable or disable a calendar app-side. Disabling removes it from every
-     * system's `Calendars.VISIBLE`. A reminder that came due while the calendar
+     * surface but Settings → Calendars (and hides its events) without touching
-     * was off stays gone when it is switched back on: the watermark has already
+     * provider data — purely a reversible Calendula-local view choice.
-     * moved past it (#75).
      */
-    fun setCalendarVisible(id: Long, visible: Boolean) = write {
+    fun setDisabled(id: Long, disabled: Boolean) {
-        repository.setCalendarsVisible(listOf(id), visible)
+        viewModelScope.launch {
+            val current = prefs.disabledCalendarIds.first()
+            val next = if (disabled) current + id else current - id
+            if (next != current) {
+                prefs.setDisabledCalendarIds(next)
+                if (!disabled) recoverReminders(setOf(id))
+            }
+        }
     }
 
     /**
-     * Switch every calendar of one account on or off. Each row is written on its
+     * Enable or disable every calendar of one account in a single write — the
-     * own, in one coroutine so the writes can't race.
+     * "toggle all" affordance on an account header. Done as one set update so the
+     * per-calendar [setDisabled] calls can't race each other.
      */
-    fun setAccountVisible(ids: Collection<Long>, visible: Boolean) = write {
+    fun setAccountDisabled(ids: Collection<Long>, disabled: Boolean) {
-        repository.setCalendarsVisible(ids, visible)
+        viewModelScope.launch {
+            val current = prefs.disabledCalendarIds.first()
+            val next = if (disabled) current + ids else current - ids.toSet()
+            if (next != current) {
+                prefs.setDisabledCalendarIds(next)
+                if (!disabled) recoverReminders(current intersect ids.toSet())
+            }
+        }
+    }
+
+    /**
+     * Re-post the reminders that fired while [reEnabledIds] were disabled and are
+     * still relevant (event not yet over), then drop them from the stash. Runs
+     * after the disabled set is written, so the notifier's own disabled gate lets
+     * them through. Best-effort at re-enable time: it mirrors the receiver gates
+     * (reminders on + postable), and there is no later re-scan, so alerts left
+     * unposted because those gates are closed are simply released.
+     */
+    private suspend fun recoverReminders(reEnabledIds: Set<Long>) {
+        if (reEnabledIds.isEmpty()) return
+        val recovered = suppressedStore.recoverFor(reEnabledIds, System.currentTimeMillis())
+        if (recovered.isNotEmpty() &&
+            settingsPrefs.remindersEnabled.first() &&
+            notifier.canPost()
+        ) {
+            recovered.forEach { notifier.post(it) }
+        }
     }
 
     // --- Automatic backup (issue #8) ------------------------------------

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/AccountGroups.kt

@@ -1,80 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.CalendarSource
-
-/**
- * One account's calendars, as every surface that lists calendars by account
- * shows them. An account is identified by name **and** type (#77): a Google and
- * a DAVx5 account can share an address and still be two separate accounts.
- */
-data class CalendarAccountGroup(
-    /** Stable identity: what makes two calendars belong to the same account. */
-    val key: AccountKey,
-    /** The account's own name, as shown when it is unambiguous. */
-    val label: String,
-    /** True when another group shows the same [label] under a different type. */
-    val ambiguous: Boolean,
-    val calendars: List<CalendarSource>,
-) {
-    val accountType: String get() = key.type
-}
-
-/** The pair a group is keyed on. */
-data class AccountKey(val name: String, val type: String)
-
-/**
- * Group [calendars] under their owning account, preserving the provider's order
- * within each group and ordering groups by first appearance.
- *
- * The label falls back through name → type → the first calendar's own name, so
- * a calendar with no account still lands somewhere sensible.
- */
-fun List<CalendarSource>.groupByAccount(): List<CalendarAccountGroup> {
-    val grouped = groupBy { AccountKey(it.accountName, it.accountType) }
-    val labels = grouped.mapValues { (key, cals) ->
-        key.name.ifBlank { key.type }.ifBlank { cals.first().displayName }
-    }
-    val shared = labels.values.groupingBy { it }.eachCount()
-    return grouped.map { (key, cals) ->
-        val label = labels.getValue(key)
-        CalendarAccountGroup(
-            key = key,
-            label = label,
-            ambiguous = shared.getValue(label) > 1,
-            calendars = cals,
-        )
-    }
-}
-
-/**
- * What to write above a group: its account name, qualified with the app the
- * account comes from when another account shares the name (#77).
- */
-@Composable
-fun accountGroupTitle(group: CalendarAccountGroup): String =
-    if (!group.ambiguous) {
-        group.label
-    } else {
-        stringResource(R.string.calendars_account_from_source, group.label, sourceAppName(group.accountType))
-    }
-
-/**
- * The human name of the app backing [accountType], falling back to the raw
- * account type when no installed app resolves for it.
- */
-@Composable
-fun sourceAppName(accountType: String): String {
-    val context = LocalContext.current
-    return remember(accountType) {
-        val pm = context.packageManager
-        val packages = sourceAppPackages(context, accountType)
-        packages.firstNotNullOfOrNull { pkg ->
-            runCatching { pm.getApplicationLabel(pm.getApplicationInfo(pkg, 0)).toString() }.getOrNull()
-        } ?: accountType
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/BlockPlacement.kt

@@ -1,75 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.core.FiniteAnimationSpec
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.animation.core.snap
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Dp
-import de.jeanlucmakiola.floret.identity.rememberReduceMotion
-
-/**
- * A timed block's own time label, crossfaded rather than replaced — the block
- * slides to its new slot, so the label shouldn't change in a single frame.
- */
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
-@Composable
-fun BlockTimeLabel(label: String, color: Color, modifier: Modifier = Modifier) {
-    val spec: FiniteAnimationSpec<Float> = if (rememberReduceMotion()) {
-        snap()
-    } else {
-        MaterialTheme.motionScheme.fastEffectsSpec()
-    }
-    Crossfade(
-        targetState = label,
-        animationSpec = spec,
-        label = "block-time",
-        modifier = modifier,
-    ) { text ->
-        Text(
-            text = text,
-            style = MaterialTheme.typography.labelSmall,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            color = color,
-        )
-    }
-}
-
-/** Where a timed block sits in its column, after tweening. */
-@Immutable
-data class BlockPlacement(val x: Dp, val y: Dp, val width: Dp, val height: Dp)
-
-/**
- * A timed block's placement, tweened rather than jumped. Continuity comes from
- * the caller keying each block by identity; a block composed for the first time
- * starts at its target, so nothing flies in on the first frame.
- *
- * A pinch-zoom rewrites the hour height every pointer frame, and the gutter and
- * grid lines follow it instantly — so the tween stands down for the gesture
- * rather than leaving the blocks trailing the ruler they are measured against.
- */
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
-@Composable
-fun animatedBlockPlacement(x: Dp, y: Dp, width: Dp, height: Dp): BlockPlacement {
-    val spec: FiniteAnimationSpec<Dp> = if (rememberReduceMotion() ||
-        LocalTimelineZoom.current.isPinching
-    ) {
-        snap()
-    } else {
-        MaterialTheme.motionScheme.fastSpatialSpec()
-    }
-    val animatedX by animateDpAsState(x, spec, label = "block-x")
-    val animatedY by animateDpAsState(y, spec, label = "block-y")
-    val animatedWidth by animateDpAsState(width, spec, label = "block-width")
-    val animatedHeight by animateDpAsState(height, spec, label = "block-height")
-    return BlockPlacement(animatedX, animatedY, animatedWidth, animatedHeight)
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarColors.kt

@@ -35,7 +35,7 @@ fun CalendarColorChip(color: Int, modifier: Modifier = Modifier) {
         Icon(
             Icons.Filled.CalendarMonth,
             contentDescription = null,
-            tint = eventAccent(color, dark, soften),
+            tint = eventFill(color, dark, soften),
             modifier = Modifier.size(22.dp),
         )
     }

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarDrawer.kt

@@ -1,6 +1,5 @@
 package de.jeanlucmakiola.calendula.ui.common
 
-import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -20,7 +19,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material3.DrawerState
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalDrawerSheet
@@ -29,23 +27,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import de.jeanlucmakiola.calendula.R
 import de.jeanlucmakiola.calendula.ui.filter.CalendarFilterList
-import de.jeanlucmakiola.floret.components.GroupedListInset
 import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.floret.components.Position
 import de.jeanlucmakiola.floret.components.positionOf
-import kotlinx.coroutines.launch
 import kotlinx.datetime.LocalDate
 
 /**
@@ -56,8 +50,7 @@ import kotlinx.datetime.LocalDate
  * a jump-to-date action, the per-calendar visibility filter (M3) inline, and a
  * pinned Settings row. The "View" section mirrors the top-bar switcher pill —
  * tapping a view here selects it (and closes the drawer) rather than cycling.
- * The host screen owns the drawer state; the sheet reads it only to dismiss
+ * The host screen owns the drawer state.
- * itself on back.
  *
  * [currentDate] seeds the jump-to-date picker (the visible day/week-start/month
  * anchor); [onJumpToDate] navigates the active view to the chosen day.
@@ -66,17 +59,12 @@ import kotlinx.datetime.LocalDate
 fun CalendarDrawer(
     currentView: CalendarView,
     currentDate: LocalDate,
-    drawerState: DrawerState,
     onSelectView: (CalendarView) -> Unit,
     onJumpToDate: (LocalDate) -> Unit,
     onSettings: () -> Unit,
     viewOrder: List<CalendarView> = IMPLEMENTED_VIEWS,
 ) {
     var showDatePicker by remember { mutableStateOf(false) }
-    val scope = rememberCoroutineScope()
-
-    // Registered in the sheet so it takes precedence over the host's back handler.
-    BackHandler(enabled = drawerState.isOpen) { scope.launch { drawerState.close() } }
 
     ModalDrawerSheet {
         // The whole sidebar scrolls as one — header, views, the calendar filter
@@ -95,7 +83,7 @@ fun CalendarDrawer(
                     position = positionOf(index, viewOrder.size),
                     selected = view == currentView,
                     minHeight = 56.dp,
-                    leading = { DrawerLeadingIcon(view.icon) },
+                    leading = { Icon(view.icon, contentDescription = null) },
                     onClick = { onSelectView(view) },
                 )
             }
@@ -105,7 +93,7 @@ fun CalendarDrawer(
                 title = stringResource(R.string.drawer_jump_to_date),
                 position = Position.Alone,
                 minHeight = 56.dp,
-                leading = { DrawerLeadingIcon(Icons.Filled.DateRange) },
+                leading = { Icon(Icons.Filled.DateRange, contentDescription = null) },
                 onClick = { showDatePicker = true },
             )
 
@@ -119,7 +107,7 @@ fun CalendarDrawer(
                 title = stringResource(R.string.month_action_settings),
                 position = Position.Alone,
                 minHeight = 56.dp,
-                leading = { DrawerLeadingIcon(Icons.Filled.Settings) },
+                leading = { Icon(Icons.Filled.Settings, contentDescription = null) },
                 onClick = onSettings,
             )
             Spacer(Modifier.height(8.dp))
@@ -138,27 +126,13 @@ fun CalendarDrawer(
     }
 }
 
-/** Leading slot for the drawer's plain icons: the same 40.dp footprint
- *  [CalendarColorChip] takes, so every leading glyph shares one vertical axis. */
-@Composable
-private fun DrawerLeadingIcon(icon: ImageVector) {
-    Box(Modifier.size(40.dp), contentAlignment = Alignment.Center) {
-        Icon(icon, contentDescription = null)
-    }
-}
-
 /** Branded header: the app-icon chip beside the app name. */
 @Composable
 private fun DrawerHeader() {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(
+            .padding(start = 28.dp, end = 28.dp, top = 24.dp, bottom = 16.dp),
-                start = GroupedListInset,
-                end = GroupedListInset,
-                top = 24.dp,
-                bottom = 16.dp,
-            ),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Box(
@@ -190,11 +164,6 @@ private fun DrawerSectionHeader(text: String) {
         text = text,
         style = MaterialTheme.typography.titleSmall,
         color = MaterialTheme.colorScheme.primary,
-        modifier = Modifier.padding(
+        modifier = Modifier.padding(start = 28.dp, end = 28.dp, top = 16.dp, bottom = 8.dp),
-            start = GroupedListInset,
-            end = GroupedListInset,
-            top = 16.dp,
-            bottom = 8.dp,
-        ),
     )
 }

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarPickerGroups.kt

@@ -11,10 +11,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.Cloud
 import androidx.compose.material.icons.filled.PhoneAndroid
-import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -34,7 +33,6 @@ import de.jeanlucmakiola.calendula.R
 import de.jeanlucmakiola.calendula.domain.CalendarSource
 import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.floret.components.Position
-import de.jeanlucmakiola.floret.components.SelectedCheck
 
 /**
  * The app's single "which calendar" selection list, shared by the event editor
@@ -44,21 +42,18 @@ import de.jeanlucmakiola.floret.components.SelectedCheck
  * account — with the calendars beneath it as a connected card, a colour chip on
  * each and a check on the selected one. Emits into the caller's [ColumnScope]
  * (a scrolling column), so the caller owns the surrounding chrome.
- *
- * The list holds event *targets* only, so a switched-off, read-only or managed
- * calendar is absent (#76). [onManageCalendars], when given, adds the footer row
- * naming the possible reasons and opening the calendar manager.
  */
 @Composable
 fun ColumnScope.CalendarPickerGroups(
     calendars: List<CalendarSource>,
     selectedId: Long?,
     onSelect: (Long) -> Unit,
-    onManageCalendars: (() -> Unit)? = null,
 ) {
     val local = remember(calendars) { calendars.filter { it.isLocal } }
     val syncedGroups = remember(calendars) {
-        calendars.filterNot { it.isLocal }.groupByAccount()
+        calendars.filterNot { it.isLocal }
+            .groupBy { it.accountName.ifBlank { it.accountType }.ifBlank { it.displayName } }
+            .toList()
     }
 
     if (local.isNotEmpty()) {
@@ -70,33 +65,16 @@ fun ColumnScope.CalendarPickerGroups(
             onSelect = onSelect,
         )
     }
-    syncedGroups.forEachIndexed { index, group ->
+    syncedGroups.forEachIndexed { index, (account, cals) ->
         if (local.isNotEmpty() || index > 0) Spacer(Modifier.height(16.dp))
         CalendarPickerGroup(
-            title = accountGroupTitle(group),
+            title = account,
-            leading = { SourceLogo(group.accountType) },
+            leading = { SourceLogo(cals.first().accountType) },
-            calendars = group.calendars,
+            calendars = cals,
             selectedId = selectedId,
             onSelect = onSelect,
         )
     }
-    if (onManageCalendars != null) {
-        Spacer(Modifier.height(16.dp))
-        GroupedRow(
-            title = stringResource(R.string.calendar_picker_missing_title),
-            summary = stringResource(R.string.calendar_picker_missing_summary),
-            position = Position.Alone,
-            leading = { LeadingAvatar(Icons.Default.VisibilityOff) },
-            trailing = {
-                Icon(
-                    Icons.AutoMirrored.Filled.KeyboardArrowRight,
-                    contentDescription = null,
-                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            },
-            onClick = onManageCalendars,
-        )
-    }
 }
 
 /** One account's category header (avatar + name) atop its selectable calendars. */
@@ -121,7 +99,13 @@ private fun CalendarPickerGroup(
             selected = isSelected,
             leading = { CalendarColorChip(calendar.color) },
             trailing = if (isSelected) {
-                { SelectedCheck() }
+                {
+                    Icon(
+                        imageVector = Icons.Default.Check,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary,
+                    )
+                }
             } else {
                 null
             },
@@ -177,21 +161,19 @@ fun LeadingAvatar(icon: ImageVector) {
 /** The launcher icon of the app backing [accountType], preferring the human-facing app. */
 private fun sourceAppLogo(context: Context, accountType: String): ImageBitmap? {
     val pm = context.packageManager
-    for (pkg in sourceAppPackages(context, accountType)) {
+    val candidates = buildList {
-        val bitmap = runCatching { pm.getApplicationIcon(pkg).toBitmap() }.getOrNull()
-        if (bitmap != null) return bitmap.asImageBitmap()
-    }
-    return null
-}
-
-/** Apps that could stand for [accountType], best candidate first. */
-internal fun sourceAppPackages(context: Context, accountType: String): List<String> = buildList {
         curatedSourcePackage(accountType)?.let { add(it) }
         AccountManager.get(context).authenticatorTypes
             .firstOrNull { it.type.equals(accountType, ignoreCase = true) }
             ?.packageName
             ?.let { add(it) }
     }
+    for (pkg in candidates) {
+        val bitmap = runCatching { pm.getApplicationIcon(pkg).toBitmap() }.getOrNull()
+        if (bitmap != null) return bitmap.asImageBitmap()
+    }
+    return null
+}
 
 /** Preferred app for account types whose authenticator isn't the app to open. */
 internal fun curatedSourcePackage(accountType: String): String? = when {

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarSwipe.kt

@@ -1,79 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.gestures.detectHorizontalDragGestures
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-
-/**
- * Drag distance that turns a calendar page, shared by the month, week and day
- * views so all three answer a swipe at the same point.
- *
- * It was 6dp once, which is inside the distance a tap wanders: brushing the grid
- * changed the month, and a page that turns on an unintended gesture reads as the
- * animation misfiring rather than as the gesture being over-eager.
- */
-val CALENDAR_SWIPE_THRESHOLD = 24.dp
-
-/**
- * The whole-page horizontal swipe: one page per gesture, committed **the moment
- * the drag clears [CALENDAR_SWIPE_THRESHOLD]** rather than when the finger lifts.
- *
- * Waiting for the lift meant the page sat still under a finger that had already
- * travelled far enough to ask for it, and the answer only arrived once you let
- * go — which reads as the view being slow rather than as a deliberate commit.
- * Firing on the threshold is what makes the gesture feel like it is being
- * followed. The trade is that a drag can no longer be taken back by dragging the
- * other way; in practice, once you have moved 24dp deliberately you meant it, and
- * the page you land on is one swipe back.
- *
- * Deliberately **horizontal-only**. The week and day timelines scroll vertically
- * underneath this, and a two-dimensional detector here would claim those drags
- * before the inner scroll ever saw them. As it is, a horizontal drag crosses this
- * detector's slop while a vertical one is consumed below, and the two coexist.
- * (The month view's split style needs a vertical axis as well, so it keeps its
- * own axis-locking detector rather than using this.)
- */
-@Composable
-fun rememberCalendarPageSwipe(
-    onSwipeNext: () -> Unit,
-    onSwipePrev: () -> Unit,
-): Modifier {
-    val threshold = with(LocalDensity.current) { CALENDAR_SWIPE_THRESHOLD.toPx() }
-    return Modifier.pointerInput(onSwipeNext, onSwipePrev) {
-        var accum = 0f
-        // One page per gesture: without this a long drag would keep re-firing
-        // every time the accumulator crossed the threshold again.
-        var fired = false
-        detectHorizontalDragGestures(
-            onDragStart = {
-                accum = 0f
-                fired = false
-            },
-            onDragEnd = {
-                accum = 0f
-                fired = false
-            },
-            onDragCancel = {
-                accum = 0f
-                fired = false
-            },
-            onHorizontalDrag = { _, drag ->
-                accum += drag
-                if (!fired) {
-                    val commit = when {
-                        accum < -threshold -> onSwipeNext
-                        accum > threshold -> onSwipePrev
-                        else -> null
-                    }
-                    if (commit != null) {
-                        fired = true
-                        commit()
-                    }
-                }
-            },
-        )
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarTitle.kt

@@ -1,34 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import de.jeanlucmakiola.floret.locale.localizedDateFormatter
-import java.util.Locale
-
-/**
- * Formats a calendar title (top bar or widget header): [skeleton]'s fields laid
- * out in [locale]'s own order, with the year shown only when [date] falls outside
- * [currentYear].
- *
- * Pass [skeleton] *without* a year field — "LLLL" for a month, "EEEdMMM" for a
- * day. A skeleton is a field list, so wanting the year is just asking for one
- * more field; the locale still decides where it lands ("July 2026" vs "2026年7月").
- *
- * Dropping the year in the current year is the one bit of policy here: the title
- * sits directly above a grid that already says which year it is, and the year's
- * *absence* is itself the signal that you're in the current one — it appears the
- * moment you page out of it, which is when it starts carrying information.
- *
- * [forceYear] overrides that for titles whose [date] does not tell the whole
- * story — a week view's title names only the month its *first* day falls in, so
- * a week straddling New Year must still show the year even though [date] is in
- * [currentYear].
- */
-fun formatCalendarTitle(
-    date: java.time.LocalDate,
-    locale: Locale,
-    currentYear: Int,
-    skeleton: String,
-    forceYear: Boolean = false,
-): String {
-    val fields = if (date.year == currentYear && !forceYear) skeleton else skeleton + "y"
-    return localizedDateFormatter(locale, fields).format(date)
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarTitleButton.kt

@@ -1,81 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.unit.dp
-import de.jeanlucmakiola.calendula.R
-import kotlinx.datetime.LocalDate
-
-/**
- * Top-bar title that doubles as the jump-to-date entry point: the formatted
- * [title] with a drop-down caret, opening the same [CalendarDatePickerDialog] the
- * drawer uses and reporting the chosen day through [onJumpToDate].
- *
- * [currentDate] seeds the picker with whatever the bar is currently naming (the
- * visible day, week start or month anchor).
- *
- * The row keeps its own 8.dp inset rather than shifting back onto the app bar's
- * start alignment: M3 places the title flush against the navigation icon's
- * trailing edge, and the title is hit-tested on top of it, so a negative offset
- * would swallow taps meant for the menu button.
- */
-@Composable
-fun CalendarTitleButton(
-    title: String,
-    currentDate: LocalDate,
-    onJumpToDate: (LocalDate) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    var showDatePicker by rememberSaveable { mutableStateOf(false) }
-
-    Row(
-        modifier = modifier
-            .heightIn(min = 48.dp)
-            .clip(MaterialTheme.shapes.large)
-            .clickable(
-                onClickLabel = stringResource(R.string.drawer_jump_to_date),
-                role = Role.Button,
-            ) { showDatePicker = true }
-            .padding(horizontal = 8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            text = title,
-            style = MaterialTheme.typography.titleLarge,
-            modifier = Modifier.weight(1f, fill = false),
-        )
-        Icon(
-            imageVector = Icons.Default.ArrowDropDown,
-            contentDescription = null,
-            tint = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-
-    if (showDatePicker) {
-        CalendarDatePickerDialog(
-            initial = currentDate,
-            onConfirm = {
-                showDatePicker = false
-                onJumpToDate(it)
-            },
-            onDismiss = { showDatePicker = false },
-        )
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/CalendarTransitions.kt

@@ -1,7 +1,6 @@
 package de.jeanlucmakiola.calendula.ui.common
 
 import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.core.FiniteAnimationSpec
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -24,13 +23,9 @@ import androidx.compose.ui.unit.IntOffset
  */
 
 /**
- * The M3 Expressive spatial spring used for the month/week/day slide: the
+ * The M3 Expressive spatial spring used for the month/week slide: the *fast*
- * *default* spring-physics spec from the active motion scheme, rather than a
+ * spring-physics spec from the active motion scheme — snappy with a subtle
- * fixed easing curve.
+ * springy settle, rather than a fixed easing curve.
- *
- * Default rather than fast: `fastSpatialSpec` is tuned for small, incidental
- * movement, and driving a whole calendar page with it made the settle read as a
- * twitch instead of a glide.
  *
  * Read it in a composable scope (this helper) so it can be captured by the
  * non-composable `AnimatedContent` transitionSpec lambda.
@@ -38,34 +33,27 @@ import androidx.compose.ui.unit.IntOffset
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun rememberCalendarSlideSpec(): FiniteAnimationSpec<IntOffset> =
-    MaterialTheme.motionScheme.defaultSpatialSpec()
+    MaterialTheme.motionScheme.fastSpatialSpec()
 
 /**
- * The effects spec from the active motion scheme, for the opacity half of the
+ * The fast effects spec from the active motion scheme, for opacity (fade)
- * transition. Captured in composable scope alongside [rememberCalendarSlideSpec]
+ * transitions. Captured in composable scope alongside [rememberCalendarSlideSpec]
- * for use in non-composable transition lambdas, and reused on its own as the
+ * for use in non-composable transition lambdas and as the reduced-motion fallback.
- * reduced-motion fallback.
- *
- * Opacity gets its own spec on purpose: M3 Expressive springs *position* and
- * eases *opacity*, and a fade that bounced with the slide would shimmer.
  */
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun rememberCalendarFadeSpec(): FiniteAnimationSpec<Float> =
-    MaterialTheme.motionScheme.defaultEffectsSpec()
+    MaterialTheme.motionScheme.fastEffectsSpec()
 
 /**
- * Navigating between adjacent months/weeks/days, as M3's shared-axis X: the
+ * Horizontal slide for navigating between adjacent months/weeks/days.
- * outgoing page slides and fades one way while the incoming one arrives from the
- * other, position on a spring and opacity on an easing curve.
  *
  * @param slideDir     +1 = forward (incoming from the right), -1 = back, 0 = jump
  *                     (e.g. "today"); a jump reuses the forward direction.
  * @param spec         spatial animation spec, typically [rememberCalendarSlideSpec].
- * @param fadeSpec     effects spec for the opacity half, and for the whole
+ * @param fadeSpec     effects spec for the reduced-motion fade, typically
- *                     transition under reduced motion; typically
  *                     [rememberCalendarFadeSpec].
- * @param reduceMotion when true, drop the movement and cross-fade alone.
+ * @param reduceMotion when true, swap the directional slide for a plain cross-fade.
  */
 fun calendarSlideTransition(
     slideDir: Int,
@@ -77,26 +65,6 @@ fun calendarSlideTransition(
         return fadeIn(fadeSpec).togetherWith(fadeOut(fadeSpec))
     }
     val dir = if (slideDir == 0) 1 else slideDir
-    return ContentTransform(
+    return slideInHorizontally(spec) { w -> dir * w }
-        targetContentEnter =
+        .togetherWith(slideOutHorizontally(spec) { w -> -dir * w })
-            slideInHorizontally(spec) { w -> dir * w / SLIDE_TRAVEL_DIVISOR } + fadeIn(fadeSpec),
-        initialContentExit =
-            slideOutHorizontally(spec) { w -> -dir * w / SLIDE_TRAVEL_DIVISOR } + fadeOut(fadeSpec),
-        // AnimatedContent clips to the animating container by default, which
-        // shears the pages against the viewport edge as they pass. There is no
-        // size change here to contain — both pages are the same grid.
-        sizeTransform = SizeTransform(clip = false),
-    )
 }
-
-/**
- * How far a page travels, as a fraction of the container width.
- *
- * A full width was the obvious reading of "paging", but the two pages are
- * stacked and both opaque, so a full-width slide showed one grid racing across
- * another — the movement carried the whole transition and had a long way to go.
- * Under M3's shared-axis pattern the offset only has to *hint* the direction
- * while the cross-fade does the swapping, so a fifth of the width is plenty and
- * leaves nothing skating past.
- */
-private const val SLIDE_TRAVEL_DIVISOR = 5

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventColors.kt

@@ -2,53 +2,45 @@ package de.jeanlucmakiola.calendula.ui.common
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
-import de.jeanlucmakiola.calendula.domain.color.eventTone
+import androidx.compose.ui.graphics.luminance
-import de.jeanlucmakiola.calendula.domain.color.inkFor
+import de.jeanlucmakiola.floret.components.pastelize
-import de.jeanlucmakiola.calendula.domain.color.oklchOf
 
 /**
- * Whether calendar/event colours are harmonised — hue kept, lightness re-pinned
+ * Whether calendar/event colours are softened toward theme-fitting pastels
- * per role — before display (issue #36). Provided app-wide from the setting; the
+ * before display (issue #36). Provided app-wide from the "soften colours"
- * default `true` is the app's own look. When off, the raw provider colour is
+ * setting; the default `true` keeps the historical look. When off, the raw
- * painted verbatim, matching the sync source (DAVx5/CalDAV) and other calendar
+ * provider colour is painted verbatim — matching the sync source (DAVx5/CalDAV)
- * apps. Widgets live outside this composition and read the preference directly,
+ * and other calendar apps. Widgets live outside this composition and read the
- * then pass the flag through.
+ * preference directly, then pass the flag to [eventFill] / [eventInk].
  */
 val LocalSoftenColors = staticCompositionLocalOf { true }
 
 /**
- * Fill for a surface that carries text on it — a week/day block, a month bar, a
+ * Display fill for an event chip/bar or a calendar tint: the [pastelize]d colour
- * widget row, a picker swatch. Pair it with [eventInk].
+ * when [soften] is on, else the raw provider ARGB verbatim (forced opaque, since
+ * pastelize also returns an opaque colour).
  */
 fun eventFill(rawArgb: Int, dark: Boolean, soften: Boolean): Color =
-    Color(eventTone(rawArgb, dark, soften).container)
+    if (soften) pastelize(rawArgb, dark) else Color(rawArgb or 0xFF000000.toInt())
 
 /**
- * Colour for a mark on an ordinary app surface — a day dot, an agenda or search
+ * Contrast ink (title text / glyph) for a filled chip painted with [eventFill]:
- * stripe, a calendar icon tint, the detail header. Same identity as [eventFill],
+ * white on a dark fill, near-black on a light one (issue #21). Applies to both
- * pinned to contrast with the surface instead of with ink.
+ * softened and raw fills — a saturated hue (deep blue, purple, red) is
+ * perceptually dark even after softening pins its HSV value, so black text on it
+ * reads poorly. The choice is objective, not a tuned threshold: white wins only
+ * when it out-contrasts black against the fill, which (by the WCAG contrast
+ * ratio) is at relative luminance ≈ 0.18 — so mid and light colours keep
+ * near-black text. [alpha] carries the caller's soft emphasis.
  */
-fun eventAccent(rawArgb: Int, dark: Boolean, soften: Boolean): Color =
+fun eventInk(fill: Color, alpha: Float = 0.8f): Color {
-    Color(eventTone(rawArgb, dark, soften).accent)
+    val useWhite = fill.luminance() < INK_LUMINANCE_CROSSOVER
+    return (if (useWhite) Color.White else Color.Black).copy(alpha = alpha)
+}
 
 /**
- * Ink for text drawn on an [eventFill]. [alpha] carries the caller's emphasis.
+ * Relative-luminance crossover where white text starts to out-contrast black.
- *
+ * Solving `contrast(white, L) = contrast(black, L)` on the WCAG ratio gives
- * Takes the fill rather than the raw colour so it stays correct for the raw
+ * `L = sqrt(1.05 * 0.05) - 0.05 ≈ 0.179`.
- * (un-harmonised) path too, where the provider decides the lightness.
  */
-fun eventInk(fill: Color, alpha: Float = 0.8f): Color =
+private const val INK_LUMINANCE_CROSSOVER = 0.179f
-    Color(inkFor(oklchOf(fill.toArgbInt()).lightness)).copy(alpha = alpha)
-
-/**
- * Ink alpha for a block's secondary line (the time under the title). Held above
- * a fainter value because harmonised containers are deep: the small time text
- * needs to stay clear of the 4.5:1 WCAG asks of body text.
- */
-const val SECONDARY_INK_ALPHA = 0.8f
-
-private fun Color.toArgbInt(): Int =
-    (0xFF shl 24) or
-        ((red * 255f).toInt().coerceIn(0, 255) shl 16) or
-        ((green * 255f).toInt().coerceIn(0, 255) shl 8) or
-        (blue * 255f).toInt().coerceIn(0, 255)

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventDrag.kt

@@ -1,150 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.input.pointer.PointerEventPass
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.LayoutCoordinates
-import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.layout.positionInRoot
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.platform.LocalViewConfiguration
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
-
-/** How far the finger may wander during the hold — well under touch slop. */
-private val PICKUP_TOLERANCE = 6.dp
-
-/**
- * Pick an event block up with a long press and drag it, without
- * `detectDragGesturesAfterLongPress`: the stock detector cancels as soon as an
- * ancestor consumes or the finger leaves the block, which a
- * `MIN_EVENT_FRACTION`-tall block loses immediately. Movement before the timeout
- * is deliberately not consumed, so a scroll starting on top of a block survives.
- */
-@Composable
-fun rememberEventDragSource(
-    enabled: Boolean,
-    key: Any?,
-    onPickUp: (pointerInRoot: Offset, blockInRoot: Offset, size: IntSize) -> Unit,
-    onMove: (pointerInRoot: Offset) -> Unit,
-    onDrop: () -> Unit,
-    onCancel: () -> Unit,
-): Modifier = rememberDragSurface(
-    enabled = enabled,
-    key = key,
-    onPickUp = { _, pointerInRoot, nodeInRoot, size ->
-        onPickUp(pointerInRoot, nodeInRoot, size)
-        true
-    },
-    onMove = onMove,
-    onDrop = onDrop,
-    onCancel = onCancel,
-)
-
-/**
- * The same pickup, for a surface that carries many draggable pieces rather than
- * being one itself — the month grid, whose chips are covered by a full-bleed tap
- * layer. [onPickUp] receives the press position local to this node and answers
- * whether anything is there; false abandons the gesture.
- */
-@Composable
-fun rememberDragSurface(
-    enabled: Boolean,
-    key: Any?,
-    onPickUp: (local: Offset, pointerInRoot: Offset, nodeInRoot: Offset, size: IntSize) -> Boolean,
-    onMove: (pointerInRoot: Offset) -> Unit,
-    onDrop: () -> Unit,
-    onCancel: () -> Unit,
-): Modifier {
-    if (!enabled) return Modifier
-    val holdMillis = LocalViewConfiguration.current.longPressTimeoutMillis
-    val tolerance = with(LocalDensity.current) { PICKUP_TOLERANCE.toPx() }
-    val coordinates = remember { arrayOfNulls<LayoutCoordinates>(1) }
-    val currentPickUp by rememberUpdatedState(onPickUp)
-    val currentMove by rememberUpdatedState(onMove)
-    val currentDrop by rememberUpdatedState(onDrop)
-    val currentCancel by rememberUpdatedState(onCancel)
-
-    return Modifier
-        .onGloballyPositioned { coordinates[0] = it }
-        .pointerInput(key) {
-            awaitEachGesture {
-                val down = awaitFirstDown(requireUnconsumed = false)
-                val origin = down.position
-                val heldStill = withTimeoutOrNull(holdMillis) {
-                    while (true) {
-                        val main = awaitPointerEvent()
-                        val change = main.changes.firstOrNull { it.id == down.id } ?: break
-                        if (!change.pressed) break
-                        if (main.changes.count { it.pressed } > 1) break
-                        if ((change.position - origin).getDistance() > tolerance) break
-                        // An ancestor's claim only becomes visible once the whole
-                        // main pass has run, so look again on the final pass.
-                        val final = awaitPointerEvent(PointerEventPass.Final)
-                        if (final.changes.any { it.isConsumed }) break
-                    }
-                } == null
-                if (!heldStill) return@awaitEachGesture
-
-                val layout = coordinates[0]?.takeIf { it.isAttached } ?: return@awaitEachGesture
-                val took = currentPickUp(
-                    down.position,
-                    layout.localToRoot(down.position),
-                    layout.positionInRoot(),
-                    layout.size,
-                )
-                if (!took) return@awaitEachGesture
-                var dropped = false
-                try {
-                    // Driven on the initial pass, which runs parent → child: an
-                    // ancestor that outranks us (the pinch) has already consumed
-                    // by the time we look, and descendants — the month grid's
-                    // full-bleed tap layer — see our consumption.
-                    while (true) {
-                        val event = awaitPointerEvent(PointerEventPass.Initial)
-                        val change = event.changes.firstOrNull { it.id == down.id } ?: break
-                        if (change.isConsumed) break
-                        if (!change.pressed) {
-                            change.consume()
-                            dropped = true
-                            break
-                        }
-                        if (event.changes.count { it.pressed } > 1) break
-                        change.consume()
-                        coordinates[0]?.takeIf { it.isAttached }
-                            ?.let { currentMove(it.localToRoot(change.position)) }
-                    }
-                } finally {
-                    // Also reached when the pointer node is disposed mid-drag —
-                    // a cancel, not a drop, and must never write.
-                    if (dropped) currentDrop() else currentCancel()
-                }
-            }
-        }
-}
-
-/** A lift on pickup, then a tick every time the drop target snaps to a new slot. */
-@Composable
-fun DragSnapHaptics(slot: Any?) {
-    val haptics = LocalHapticFeedback.current
-    val previous = remember { arrayOfNulls<Any>(1) }
-    LaunchedEffect(slot) {
-        val had = previous[0]
-        previous[0] = slot
-        when {
-            slot == null -> Unit
-            had == null -> haptics.performHapticFeedback(HapticFeedbackType.LongPress)
-            had != slot -> haptics.performHapticFeedback(HapticFeedbackType.SegmentTick)
-        }
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventFormFieldVisuals.kt

@@ -9,7 +9,6 @@ import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.People
 import androidx.compose.material.icons.filled.Place
-import androidx.compose.material.icons.filled.Public
 import androidx.compose.material.icons.filled.Repeat
 import androidx.compose.ui.graphics.vector.ImageVector
 import de.jeanlucmakiola.calendula.R
@@ -25,7 +24,6 @@ import de.jeanlucmakiola.calendula.domain.EventFormField
 fun eventFormFieldLabel(field: EventFormField): Int = when (field) {
     EventFormField.Location -> R.string.event_detail_location
     EventFormField.Description -> R.string.event_detail_description
-    EventFormField.Timezone -> R.string.event_detail_timezone
     EventFormField.Reminders -> R.string.event_detail_reminders
     EventFormField.Recurrence -> R.string.event_detail_recurrence
     EventFormField.Availability -> R.string.event_edit_availability
@@ -37,7 +35,6 @@ fun eventFormFieldLabel(field: EventFormField): Int = when (field) {
 fun eventFormFieldIcon(field: EventFormField): ImageVector = when (field) {
     EventFormField.Location -> Icons.Default.Place
     EventFormField.Description -> Icons.AutoMirrored.Filled.Notes
-    EventFormField.Timezone -> Icons.Default.Public
     EventFormField.Reminders -> Icons.Default.Notifications
     EventFormField.Recurrence -> Icons.Default.Repeat
     EventFormField.Availability -> Icons.Default.EventAvailable

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventMoveHost.kt

@@ -1,144 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.floret.components.SnackChip
-import de.jeanlucmakiola.floret.components.SnackChipHeight
-import de.jeanlucmakiola.floret.components.SnackChipMargin
-import de.jeanlucmakiola.floret.locale.currentLocale
-import de.jeanlucmakiola.floret.locale.localizedDateFormatter
-import kotlinx.coroutines.delay
-import java.time.Instant
-import java.time.ZoneId
-import java.time.ZoneOffset
-import java.util.Locale
-
-/** How long the confirmation chip stays up, matching a short snackbar. */
-private const val CHIP_MILLIS = 4_000L
-
-/** How long an *undone* move stays up — shorter, since it offers nothing to act on. */
-private const val UNDONE_CHIP_MILLIS = 1_600L
-
-/** What the chip currently reads, kept past the outcome it was built from. */
-private data class ChipContent(val message: String, val undo: MoveUndo?)
-
-/** The FAB's own band at the bottom end, which the chip must not run into. */
-private val FAB_BAND = 88.dp
-
-/**
- * The two surfaces a drag-and-drop reschedule needs on top of the calendar: the
- * recurring-scope prompt, and the confirmation chip carrying Undo. None of the
- * calendar screens sets a `snackbarHost`, so this hosts its own confirmation as
- * a pill on the FAB's band, leaving the calendar visible behind it.
- */
-@Composable
-fun EventMoveHost(viewModel: RescheduleViewModel, modifier: Modifier = Modifier) {
-    val prompt by viewModel.scopePrompt.collectAsStateWithLifecycle()
-    val outcome by viewModel.outcome.collectAsStateWithLifecycle()
-    val undoTick by viewModel.undoStarted.collectAsStateWithLifecycle()
-    val writeInFlight by viewModel.inFlight.collectAsStateWithLifecycle()
-    val locale = currentLocale()
-    val use24Hour = LocalUse24HourFormat.current
-
-    prompt?.let { pending ->
-        RecurringScopeDialog(
-            title = stringResource(R.string.event_move_recurring_title),
-            onSelect = viewModel::moveWithScope,
-            onDismiss = viewModel::cancelScope,
-            allowSeries = !pending.occurrenceOnly,
-            reason = stringResource(R.string.event_move_occurrence_only)
-                .takeIf { pending.occurrenceOnly },
-        )
-    }
-
-    val moved = outcome as? MoveOutcome.Moved
-    val movedLabel = moved?.let { formatMovedTo(it.startMillis, it.isAllDay, use24Hour, locale) }
-    val message = when (outcome) {
-        null -> null
-        is MoveOutcome.Moved -> stringResource(R.string.event_move_done, movedLabel.orEmpty())
-        MoveOutcome.Undone -> stringResource(R.string.event_move_undone)
-        MoveOutcome.WriteDenied -> stringResource(R.string.event_move_write_denied)
-        MoveOutcome.Gone -> stringResource(R.string.event_move_gone)
-        MoveOutcome.BlockedSeriesEnd -> stringResource(R.string.event_move_blocked_series_end)
-        MoveOutcome.Failed -> stringResource(R.string.event_move_failed)
-    }
-
-    // Held past the outcome being consumed so the chip has something to draw
-    // while it springs back out. Updated in composition rather than from an
-    // effect, which would land a frame late and open the chip on stale text.
-    val shown = remember { mutableStateOf(ChipContent("", null)) }
-    if (message != null && (shown.value.message != message || shown.value.undo != moved?.undo)) {
-        shown.value = ChipContent(message, moved?.undo)
-    }
-    val content = shown.value
-    // Restarted by the undo tick and held while a write is in flight: an undo
-    // tapped in the last moments of the window leaves the outcome at Moved on
-    // purpose, and this timer would otherwise fire mid-undo and close the chip
-    // just before the same chip has to say "undone".
-    LaunchedEffect(outcome, undoTick, writeInFlight) {
-        if (outcome == null || writeInFlight) return@LaunchedEffect
-        delay(if (outcome == MoveOutcome.Undone) UNDONE_CHIP_MILLIS else CHIP_MILLIS)
-        viewModel.consumeOutcome()
-    }
-
-    BoxWithConstraints(modifier = modifier.fillMaxSize()) {
-        val chipMaxWidth = maxWidth - FAB_BAND
-        // A FAB-height band at the bottom start with the FAB's own margin, so
-        // the chip lines up beside the bottom-end FAB.
-        Box(
-            modifier = Modifier
-                .align(Alignment.BottomStart)
-                .navigationBarsPadding()
-                .padding(start = SnackChipMargin, bottom = SnackChipMargin)
-                .height(SnackChipHeight),
-            contentAlignment = Alignment.CenterStart,
-        ) {
-            // The action goes away while a write runs: undo() refuses a second
-            // write anyway, so offering it would be a button that does nothing.
-            val undo = content.undo?.takeIf { !writeInFlight }
-            SnackChip(
-                visible = outcome != null,
-                message = content.message,
-                maxWidth = chipMaxWidth,
-                actionLabel = stringResource(R.string.event_move_undo).takeIf { undo != null },
-                onAction = undo?.let { { viewModel.undo(it) } },
-            )
-        }
-    }
-}
-
-/**
- * "Fri, 7 Aug, 09:00" — the day, plus the time for a timed event. All-day events
- * are read back on the UTC calendar day they are anchored to (#65, #82).
- */
-private fun formatMovedTo(
-    startMillis: Long,
-    isAllDay: Boolean,
-    use24Hour: Boolean,
-    locale: Locale,
-): String {
-    val zone: ZoneId = if (isAllDay) ZoneOffset.UTC else ZoneId.systemDefault()
-    val skeleton = when {
-        isAllDay -> "EEEdMMM"
-        use24Hour -> "EEEdMMMHm"
-        else -> "EEEdMMMhm"
-    }
-    return localizedDateFormatter(locale, skeleton)
-        .format(Instant.ofEpochMilli(startMillis).atZone(zone))
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventMoveScope.kt

@@ -1,109 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.CustomAccessibilityAction
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.EventInstance
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-/**
- * Drag-to-reschedule wiring (#68), provided once at `CalendarHost` and read by
- * whichever event block is being composed. Null means moving is off entirely and
- * blocks register no drag gesture at all.
- */
-@Immutable
-class EventMoveScope(
-    /**
-     * Calendars whose events may be moved. Nothing below the UI enforces this —
-     * the repository writes whatever it is handed — so this gate is load-bearing.
-     */
-    val movableCalendarIds: Set<Long>,
-    /** False when the drop was refused outright, so nothing will be written. */
-    val move: (MoveRequest) -> Boolean,
-    /**
-     * True while a dropped event is being written, including the time its scope
-     * dialog is up. A flow rather than a value so this scope stays the same
-     * object across a move — every visible block reads it as a composition local.
-     */
-    val inFlight: StateFlow<Boolean>,
-    /** Ticks when an undo write begins — see `RescheduleViewModel.undoStarted`. */
-    val undoStarted: StateFlow<Int>,
-    /** Open an event in the edit form — the pointer-free route to the same change. */
-    val edit: (EventInstance) -> Unit,
-) {
-    fun allows(event: EventInstance): Boolean = event.calendarId in movableCalendarIds
-}
-
-val LocalEventMove = compositionLocalOf<EventMoveScope?> { null }
-
-private val NEVER_IN_FLIGHT = MutableStateFlow(false)
-
-private val NEVER_UNDONE = MutableStateFlow(0)
-
-/**
- * Whether a dropped event is still being written — false wherever moving is off.
- * The drag overlays hold a landed block on its target for this window.
- */
-@Composable
-fun moveInFlight(): Boolean {
-    val flow = LocalEventMove.current?.inFlight ?: NEVER_IN_FLIGHT
-    return flow.collectAsStateWithLifecycle().value
-}
-
-/**
- * Runs [onUndo] when an undo write begins, and never for one that began before
- * this composable came on screen.
- */
-@Composable
-fun OnUndoStarted(onUndo: () -> Unit) {
-    val flow = LocalEventMove.current?.undoStarted ?: NEVER_UNDONE
-    val tick by flow.collectAsStateWithLifecycle()
-    var seen by remember { mutableIntStateOf(tick) }
-    LaunchedEffect(tick) {
-        if (tick == seen) return@LaunchedEffect
-        seen = tick
-        onUndo()
-    }
-}
-
-/** Opacity the source block keeps while its floating copy travels. */
-const val GHOST_ALPHA: Float = 0.3f
-
-/**
- * Opacity for a block whose copy is in flight: ghosted from the lift until the
- * copy is handed back, then animated up rather than switched, so the block
- * appears to travel to its new slot instead of vanishing and reappearing.
- */
-@Composable
-fun ghostAlpha(lifted: Boolean): Float = animateFloatAsState(
-    targetValue = if (lifted) GHOST_ALPHA else 1f,
-    label = "ghost-alpha",
-).value
-
-/**
- * A TalkBack action that opens [event] in the edit form, so rescheduling isn't
- * pointer-only. Null when this event can't be moved.
- */
-@Composable
-fun eventMoveAction(event: EventInstance): CustomAccessibilityAction? {
-    val move = LocalEventMove.current ?: return null
-    if (!move.allows(event)) return null
-    val label = stringResource(R.string.event_move_action)
-    return remember(event.instanceId, label, move) {
-        CustomAccessibilityAction(label) {
-            move.edit(event)
-            true
-        }
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/HourGutter.kt

@@ -1,119 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.ScrollState
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import de.jeanlucmakiola.floret.locale.currentLocale
-
-/** Width of the hour gutter down the start edge of the day and week timelines. */
-val GUTTER_WIDTH = 48.dp
-
-/**
- * Start inset for the gutter's content (week badge + hour labels) so it centres
- * on the top bar's hamburger: with a 48dp gutter, 8dp lands the centre at 28dp,
- * matching the icon button's centre.
- */
-val GUTTER_CONTENT_START_INSET = 8.dp
-
-private val BADGE_HEIGHT = 20.dp
-
-/** How far the fixed hour labels recede while a block is being dragged. */
-private const val DIMMED_HOUR_ALPHA = 0.3f
-
-/**
- * The timeline's hour gutter. Scrolls in sync with the day columns through the
- * shared [scrollState], and while [dragController] holds a lifted block it dims
- * the hour labels and floats a badge with the drag's current start time at the
- * row the block would land on.
- */
-@Composable
-fun HourGutter(
-    scrollState: ScrollState,
-    hourHeight: Dp,
-    dragController: TimelineDragController,
-    modifier: Modifier = Modifier,
-) {
-    val use24Hour = LocalUse24HourFormat.current
-    val locale = currentLocale()
-    // Derived: the drag is rewritten every frame, its snapped start once a slot.
-    val dragStartMin by remember(dragController) {
-        derivedStateOf { dragController.drag?.startMin }
-    }
-    val hourAlpha by animateFloatAsState(
-        targetValue = if (dragStartMin != null) DIMMED_HOUR_ALPHA else 1f,
-        label = "hourLabelAlpha",
-    )
-
-    Box(
-        modifier = modifier
-            .width(GUTTER_WIDTH)
-            .padding(start = GUTTER_CONTENT_START_INSET)
-            .fillMaxHeight()
-            .verticalScroll(scrollState),
-    ) {
-        Column {
-            (0 until 24).forEach { h ->
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(hourHeight),
-                ) {
-                    if (h > 0) {
-                        Text(
-                            text = formatHourLabel(h, use24Hour, locale),
-                            style = MaterialTheme.typography.labelSmall,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                                .copy(alpha = hourAlpha),
-                            modifier = Modifier
-                                .align(Alignment.TopCenter)
-                                .offset(y = (-6).dp),
-                        )
-                    }
-                }
-            }
-        }
-        dragStartMin?.let { startMin ->
-            val top = (hourHeight * (startMin / 60f) - BADGE_HEIGHT / 2).coerceAtLeast(0.dp)
-            Box(
-                modifier = Modifier
-                    .align(Alignment.TopCenter)
-                    .offset(y = top)
-                    .height(BADGE_HEIGHT)
-                    .background(MaterialTheme.colorScheme.primary, CircleShape)
-                    .padding(horizontal = 4.dp)
-                    // The dragged block already announces this time.
-                    .clearAndSetSemantics { },
-                contentAlignment = Alignment.Center,
-            ) {
-                Text(
-                    text = formatGutterTime(startMin, use24Hour, locale),
-                    style = MaterialTheme.typography.labelSmall,
-                    color = MaterialTheme.colorScheme.onPrimary,
-                    maxLines = 1,
-                    softWrap = false,
-                )
-            }
-        }
-    }
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/LocaleSupport.kt

@@ -0,0 +1,33 @@
+package de.jeanlucmakiola.calendula.ui.common
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.core.os.ConfigurationCompat
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+/**
+ * Current display [Locale], read observably from [LocalConfiguration] so the UI
+ * recomposes after a locale change (lint: NonObservableLocale). Used for
+ * weekday/month name formatting.
+ */
+@Composable
+fun currentLocale(): Locale {
+    val configuration = LocalConfiguration.current
+    return remember(configuration) {
+        ConfigurationCompat.getLocales(configuration).get(0) ?: Locale.getDefault()
+    }
+}
+
+/**
+ * A [DateTimeFormatter] for [skeleton]'s fields laid out in [locale]'s own order
+ * (via Android's best-pattern matching), so dates read naturally per locale
+ * instead of a hardcoded day-month-year order. [skeleton] lists the wanted
+ * fields, e.g. "dMMMy" (day, abbreviated month, year) or "EEEdMMM" (weekday too).
+ */
+fun localizedDateFormatter(locale: Locale, skeleton: String): DateTimeFormatter =
+    DateTimeFormatter.ofPattern(
+        android.text.format.DateFormat.getBestDateTimePattern(locale, skeleton),
+        locale,
+    )

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/Picker.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -23,26 +24,15 @@ import androidx.compose.ui.unit.dp
 import de.jeanlucmakiola.calendula.R
 import de.jeanlucmakiola.floret.components.CustomAmountEditor
 import de.jeanlucmakiola.floret.components.FullScreenPicker
-import de.jeanlucmakiola.floret.components.GroupedListInset
 import de.jeanlucmakiola.floret.components.GroupedRow
 import de.jeanlucmakiola.floret.components.Position
-import de.jeanlucmakiola.floret.components.SelectedCheck
 import de.jeanlucmakiola.floret.components.positionOf
 import de.jeanlucmakiola.floret.identity.collapseExit
 import de.jeanlucmakiola.floret.identity.expandEnter
-import de.jeanlucmakiola.floret.locale.currentLocale
 import de.jeanlucmakiola.floret.reminders.ReminderOverride
 import de.jeanlucmakiola.floret.reminders.ReminderUnit
 import de.jeanlucmakiola.floret.reminders.reminderOverrideForMinutes
 import de.jeanlucmakiola.calendula.ui.agenda.AgendaRange
-import de.jeanlucmakiola.calendula.ui.agenda.agendaRangeWindowSummary
-import de.jeanlucmakiola.calendula.ui.agenda.dayCount
-import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.DayOfWeek
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.plus
-import kotlinx.datetime.toLocalDateTime
-import kotlin.time.Clock
 
 /**
  * Reminder-default picker, full-screen and **multi-select**: each [presets]
@@ -58,10 +48,6 @@ import kotlin.time.Clock
  * row expands an inline number field plus a unit selector to add an arbitrary
  * lead time to the set. Changes apply live via [onSelect]; the user leaves via
  * back.
- *
- * [leadTimeSummary] adds a second line to each lead-time row, for the all-day
- * pickers: the hour comes from the separate "show all-day reminders at" setting,
- * so the lead time alone doesn't say when anything happens.
  */
 @Composable
 fun ReminderDefaultPicker(
@@ -71,7 +57,6 @@ fun ReminderDefaultPicker(
     allowInherit: Boolean,
     onSelect: (ReminderOverride) -> Unit,
     onDismiss: () -> Unit,
-    leadTimeSummary: (@Composable (Int) -> String?)? = null,
 ) {
     // Optimistic local state: once the user edits, the chosen override is
     // authoritative while the picker is open, so quick successive toggles compose
@@ -147,7 +132,6 @@ fun ReminderDefaultPicker(
             val checked = minute in selectedMinutes
             GroupedRow(
                 title = reminderLeadTimeLabel(minute),
-                summary = leadTimeSummary?.invoke(minute),
                 position = positionOf(index, rowCount),
                 selected = checked,
                 trailing = { Checkbox(checked = checked, onCheckedChange = { toggle(minute) }) },
@@ -212,35 +196,37 @@ private fun CustomReminderEditor(
     )
 }
 
-/** A short explanatory paragraph shown under a picker's title, above the rows,
+/** A short explanatory paragraph shown under a picker's title, above the rows. */
- *  on the same left margin as the rows themselves. */
 @Composable
-internal fun PickerDescription(text: String) {
+private fun PickerDescription(text: String) {
     Text(
         text = text,
         style = MaterialTheme.typography.bodyMedium,
         color = MaterialTheme.colorScheme.onSurfaceVariant,
-        modifier = Modifier.padding(horizontal = GroupedListInset, vertical = 8.dp),
+        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     )
 }
 
+@Composable
+private fun SelectedCheck() {
+    Icon(
+        imageVector = Icons.Default.Check,
+        contentDescription = null,
+        tint = MaterialTheme.colorScheme.primary,
+    )
+}
 
 /**
  * Agenda-range picker, full-screen. Two grouped lists — the calendar-aligned
  * options (today / this week / this month) and the rolling windows (next 7 / 30
  * days), with a "Custom" row that expands an inline day-count editor (1–365).
  * Mirrors [ReminderDefaultPicker]'s custom-expand pattern.
- *
- * Every option carries the dates it resolves to today as its summary, computed
- * through the same [dayCount] the agenda windows by (hence [weekStart]) — only
- * the concrete span tells "This week" and "Next 7 days" apart.
  */
 @Composable
 fun AgendaRangePicker(
     title: String,
     description: String,
     selected: AgendaRange,
-    weekStart: DayOfWeek,
     onSelect: (AgendaRange) -> Unit,
     onDismiss: () -> Unit,
 ) {
@@ -254,21 +240,10 @@ fun AgendaRangePicker(
         mutableStateOf((selected as? AgendaRange.Custom)?.days?.toString() ?: "")
     }
 
-    val locale = currentLocale()
-    val zone = remember { TimeZone.currentSystemDefault() }
-    val today = remember(zone) { Clock.System.now().toLocalDateTime(zone).date }
-    // The agenda's own end-day arithmetic (anchor + dayCount - 1), so the dates
-    // match what it will show.
-    val windowSummary: (AgendaRange) -> String = { range ->
-        val end = today.plus(range.dayCount(today, weekStart) - 1, DateTimeUnit.DAY)
-        agendaRangeWindowSummary(range, today, end, locale, monthAsSpan = true)
-    }
-
     val rangeRow: @Composable (AgendaRange, Position) -> Unit = { option, position ->
         val isSelected = option == selected
         GroupedRow(
             title = agendaRangeLabel(option),
-            summary = windowSummary(option),
             position = position,
             selected = isSelected,
             trailing = if (isSelected) {
@@ -303,9 +278,6 @@ fun AgendaRangePicker(
             } else {
                 stringResource(R.string.agenda_range_custom)
             },
-            // An unset custom window has no day count yet, so the row stays
-            // single-line until it does.
-            summary = if (customSelected) windowSummary(selected) else null,
             position = if (customExpanded) Position.Top else positionOf(rolling.size, rollingRowCount),
             selected = customSelected,
             trailing = if (customSelected) {
@@ -354,66 +326,35 @@ private fun CustomDaysEditor(
 }
 
 /**
- * Duration picker, full-screen and **single-select**: the [presets] (whole-minute
+ * Snooze-duration picker, full-screen and **single-select**: the [presets]
- * lengths) each sit as a checkmark row, with a "Custom" row that expands an
+ * (whole-minute delays) each sit as a checkmark row, with a "Custom" row that
- * inline amount field plus a Minutes/Hours unit toggle to enter an arbitrary
+ * expands an inline amount field plus a Minutes/Hours unit toggle to enter an
- * one. Mirrors [AgendaRangePicker]'s custom-expand pattern; picking a preset or
+ * arbitrary delay. Mirrors [AgendaRangePicker]'s custom-expand pattern; picking
- * confirming a custom value applies via [onSelect] and closes. [label] renders a
+ * a preset or confirming a custom value applies via [onSelect] and closes.
- * length in minutes ("10 minutes", "1 hour") and is reused for both the rows and
+ * [label] renders a delay in minutes as a duration ("10 minutes", "1 hour") and
- * the custom preview.
+ * is reused for both the rows and the custom preview.
- *
- * [inheritLabel] adds an exclusive "use the default" row on top, for the
- * per-calendar pickers; picking it reports null. [selected] is null exactly when
- * that row is the current choice. [description] explains the setting above the
- * rows when it needs it. [maxMinutes] caps what the custom editor will confirm,
- * for settings that clamp their stored value — offering a length the store would
- * silently shorten is worse than refusing it.
  */
 @Composable
-fun DurationPicker(
+fun SnoozeDurationPicker(
     title: String,
     presets: List<Int>,
-    selected: Int?,
+    selected: Int,
     label: @Composable (Int) -> String,
-    onSelect: (Int?) -> Unit,
+    onSelect: (Int) -> Unit,
     onDismiss: () -> Unit,
-    description: String? = null,
-    inheritLabel: String? = null,
-    maxMinutes: Int = Int.MAX_VALUE,
 ) {
-    val inherits = selected == null
+    val customSelected = selected !in presets
-    // The current choice when it isn't one of the presets — the Custom row then
-    // names it and the editor opens pre-filled with it.
-    val custom = selected?.takeIf { it !in presets }
     val rowCount = presets.size + 1 // + the custom row
 
     var customExpanded by rememberSaveable { mutableStateOf(false) }
     var amountText by rememberSaveable {
-        mutableStateOf(custom?.let { durationCustomAmount(it).toString() }.orEmpty())
+        mutableStateOf(if (customSelected) snoozeCustomAmount(selected).toString() else "")
     }
     var unit by rememberSaveable {
-        mutableStateOf(custom?.let { durationCustomUnit(it) } ?: ReminderUnit.Minutes)
+        mutableStateOf(if (customSelected) snoozeCustomUnit(selected) else ReminderUnit.Minutes)
     }
 
     FullScreenPicker(title = title, onDismiss = onDismiss, predictiveBack = true) {
-        if (description != null) PickerDescription(description)
-        if (inheritLabel != null) {
-            GroupedRow(
-                title = inheritLabel,
-                position = Position.Alone,
-                selected = inherits,
-                trailing = if (inherits) {
-                    { SelectedCheck() }
-                } else {
-                    null
-                },
-                onClick = {
-                    onSelect(null)
-                    onDismiss()
-                },
-            )
-            Spacer(Modifier.height(24.dp))
-        }
         presets.forEachIndexed { index, minute ->
             val isSelected = minute == selected
             GroupedRow(
@@ -434,10 +375,10 @@ fun DurationPicker(
         // The Custom row connects downward into the editor card when expanded, so
         // the two read as one grouped container (the shared custom-expand pattern).
         GroupedRow(
-            title = custom?.let { label(it) } ?: stringResource(R.string.event_edit_reminder_custom),
+            title = if (customSelected) label(selected) else stringResource(R.string.event_edit_reminder_custom),
             position = if (customExpanded) Position.Top else positionOf(presets.size, rowCount),
-            selected = custom != null,
+            selected = customSelected,
-            trailing = if (custom != null) {
+            trailing = if (customSelected) {
                 { SelectedCheck() }
             } else {
                 null
@@ -449,13 +390,12 @@ fun DurationPicker(
             enter = expandEnter(),
             exit = collapseExit(),
         ) {
-            CustomDurationEditor(
+            CustomSnoozeEditor(
                 amountText = amountText,
                 onAmountChange = { amountText = it },
                 unit = unit,
                 onUnitChange = { unit = it },
                 label = label,
-                maxMinutes = maxMinutes,
                 onConfirm = { minutes ->
                     onSelect(minutes)
                     onDismiss()
@@ -465,48 +405,41 @@ fun DurationPicker(
     }
 }
 
-/** Whole hours if the length divides evenly, else minutes. */
+/** Whole hours if the delay divides evenly, else minutes. */
-private fun durationCustomUnit(minutes: Int): ReminderUnit =
+private fun snoozeCustomUnit(minutes: Int): ReminderUnit =
     if (minutes % ReminderUnit.Hours.minutesFactor == 0) ReminderUnit.Hours else ReminderUnit.Minutes
 
-private fun durationCustomAmount(minutes: Int): Int =
+private fun snoozeCustomAmount(minutes: Int): Int =
     if (minutes % ReminderUnit.Hours.minutesFactor == 0) minutes / ReminderUnit.Hours.minutesFactor else minutes
 
 /**
- * The expanded "Custom" duration editor: a tonal card connected to the Custom row
+ * The expanded "Custom" snooze editor: a tonal card connected to the Custom row
  * above it. A Minutes/Hours unit toggle, an amount field with a live preview of
- * the length it resolves to, and a tonal confirm enabled only for a valid 1–999
+ * the delay it resolves to, and a tonal confirm enabled only for a valid 1–999
- * amount that stays within [maxMinutes]. Over the cap, the preview names the
+ * amount. [onConfirm] receives the final delay in minutes.
- * limit instead of a length the setting could not keep. [onConfirm] receives the
- * final length in minutes.
  */
 @Composable
-private fun CustomDurationEditor(
+private fun CustomSnoozeEditor(
     amountText: String,
     onAmountChange: (String) -> Unit,
     unit: ReminderUnit,
     onUnitChange: (ReminderUnit) -> Unit,
     label: @Composable (Int) -> String,
-    maxMinutes: Int,
     onConfirm: (Int) -> Unit,
 ) {
     val units = remember { listOf(ReminderUnit.Minutes, ReminderUnit.Hours) }
-    val entered = amountText.toIntOrNull()?.takeIf { it in 1..999 }?.times(unit.minutesFactor)
+    val amount = amountText.toIntOrNull()?.takeIf { it in 1..999 }
-    val amount = entered?.takeIf { it <= maxMinutes }
     CustomAmountEditor(
         amountText = amountText,
         onAmountChange = onAmountChange,
         unitLabels = units.map { stringResource(reminderUnitLabel(it)) },
         selectedUnit = units.indexOf(unit).coerceAtLeast(0),
         onUnitChange = { onUnitChange(units[it]) },
-        preview = when {
+        preview = amount?.let { label(it * unit.minutesFactor) }
-            amount != null -> label(amount)
+            ?: stringResource(R.string.reminder_custom_amount),
-            entered != null -> stringResource(R.string.duration_custom_max, label(maxMinutes))
-            else -> stringResource(R.string.reminder_custom_amount)
-        },
         setLabel = stringResource(R.string.reminder_custom_set),
         confirmEnabled = amount != null,
-        onConfirm = { amount?.let(onConfirm) },
+        onConfirm = { amount?.let { onConfirm(it * unit.minutesFactor) } },
     )
 }
 

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/RecurrenceText.kt

@@ -8,16 +8,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.SimpleRecurrence
-import de.jeanlucmakiola.calendula.domain.occurrencesSpanYears
-import de.jeanlucmakiola.calendula.domain.upcomingOccurrences
-import de.jeanlucmakiola.floret.locale.localizedDateFormatter
-import kotlinx.datetime.toJavaLocalDate
 import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.time.format.TextStyle as JavaTextStyle
@@ -103,33 +94,6 @@ fun recurrenceText(rrule: String, locale: Locale): AnnotatedString {
     }
 }
 
-/**
- * The rule's first few dates as one line — "Next: 30 Jul, 6 Aug, 13 Aug" — for
- * the recurrence picker, where [recurrenceText]'s phrase says what the rule is
- * and this says what it does. Expands via [upcomingOccurrences] and inherits its
- * limits. A rule that yields nothing says so rather than showing an empty list.
- */
-@Composable
-fun nextOccurrencesText(
-    rule: SimpleRecurrence,
-    start: kotlinx.datetime.LocalDate,
-    locale: Locale,
-): String {
-    val dates = rule.upcomingOccurrences(start, limit = NEXT_OCCURRENCE_COUNT)
-    if (dates.isEmpty()) return stringResource(R.string.event_edit_recurrence_next_none)
-    // Years only once they carry information (see [spansMultipleYears]).
-    val pattern = if (occurrencesSpanYears(dates, start)) "dMMMy" else "dMMM"
-    val formatter = localizedDateFormatter(locale, pattern)
-    val formatted = dates.map { formatter.format(it.toJavaLocalDate()) }
-    return stringResource(
-        R.string.event_edit_recurrence_next,
-        ListFormatter.getInstance(locale).format(formatted),
-    )
-}
-
-/** Enough dates to show a rhythm (and a skipped month), few enough for one line. */
-private const val NEXT_OCCURRENCE_COUNT = 3
-
 /** Map an RRULE BYDAY token (e.g. "TU" or "2TH") to a localized short weekday name. */
 private fun rruleDayName(token: String, locale: Locale): String? {
     val dow = when (token.takeLast(2).uppercase()) {
@@ -147,36 +111,16 @@ private fun rruleDayName(token: String, locale: Locale): String? {
 
 /** Parse an RRULE UNTIL value ("20261231" or "20261231T235959Z") to a localized date. */
 private fun parseUntilDate(raw: String, locale: Locale): String? {
-    val date = untilLocalDate(raw) ?: return null
+    val digits = raw.takeWhile { it.isDigit() }
-    return DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).withLocale(locale).format(date)
+    if (digits.length < 8) return null
-}
+    return try {
-
+        val date = java.time.LocalDate.of(
-private val UNTIL_UTC_FORMAT: DateTimeFormatter =
-    DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'", Locale.ROOT)
-
-/**
- * The calendar day an RRULE UNTIL value denotes, *in the device's zone*.
- *
- * The UTC form ("20261231T225959Z") must be converted back before its date is
- * read: `SimpleRecurrence.toRRule` writes the end of the chosen **local** day
- * expressed in UTC, so for zones behind UTC that instant already falls on the
- * following UTC date. Taking the leading digits straight off would then show
- * the day after the one the user picked. Date-only and floating forms are
- * already local and pass through unchanged.
- */
-internal fun untilLocalDate(raw: String, zone: ZoneId = ZoneId.systemDefault()): LocalDate? {
-    val value = raw.trim()
-    return runCatching {
-        LocalDateTime.parse(value, UNTIL_UTC_FORMAT)
-            .atOffset(ZoneOffset.UTC)
-            .atZoneSameInstant(zone)
-            .toLocalDate()
-    }.recoverCatching {
-        val digits = value.takeWhile { it.isDigit() }
-        LocalDate.of(
             digits.substring(0, 4).toInt(),
             digits.substring(4, 6).toInt(),
             digits.substring(6, 8).toInt(),
         )
-    }.getOrNull()
+        DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).withLocale(locale).format(date)
+    } catch (e: Exception) {
+        null
+    }
 }

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/RecurringScopeDialog.kt

@@ -1,69 +0,0 @@
-package de.jeanlucmakiola.calendula.ui.common
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import de.jeanlucmakiola.calendula.R
-import de.jeanlucmakiola.calendula.domain.RecurringWriteScope
-import de.jeanlucmakiola.floret.components.OptionCard
-
-/**
- * How far a write to a recurring event should reach: this occurrence, it and
- * everything after (a series split), or the whole series. Shared by the edit
- * screen's save and a drag-and-drop reschedule; one of the two carve-outs from
- * the full-screen picker rule.
- *
- * [allowOccurrence] drops "only this event" (an exception row can't carry its own
- * rule); [allowSeries] drops the two wider options, for a rule whose days can't
- * be recalculated from one moved occurrence — [reason] then says why.
- */
-@Composable
-fun RecurringScopeDialog(
-    title: String,
-    onSelect: (RecurringWriteScope) -> Unit,
-    onDismiss: () -> Unit,
-    allowOccurrence: Boolean = true,
-    allowSeries: Boolean = true,
-    reason: String? = null,
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(title) },
-        text = {
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                if (reason != null) {
-                    Text(
-                        text = reason,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-                if (allowOccurrence) {
-                    OptionCard(
-                        label = stringResource(R.string.event_delete_option_occurrence),
-                        onClick = { onSelect(RecurringWriteScope.ThisEvent) },
-                    )
-                }
-                if (allowSeries) {
-                    OptionCard(
-                        label = stringResource(R.string.event_delete_option_following),
-                        onClick = { onSelect(RecurringWriteScope.ThisAndFollowing) },
-                    )
-                    OptionCard(
-                        label = stringResource(R.string.event_delete_option_series),
-                        onClick = { onSelect(RecurringWriteScope.AllEvents) },
-                    )
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
-        },
-    )
-}

app/src/main/java/de/jeanlucmakiola/calendula/ui/common/ReminderFormatting.kt

@@ -37,21 +37,3 @@ fun reminderLeadTimeLabel(minutes: Int): String = when {
         pluralStringResource(R.plurals.reminder_hours, minutes / 60, minutes / 60)
     else -> pluralStringResource(R.plurals.reminder_minutes, minutes, minutes)
 }
-
-/**
- * Humanise a plain duration — no "before": "45 minutes", "8 hours", or both
- * parts for a mixed length ("1 hour 30 minutes"). Shared by the snooze delay and
- * the default event duration (#54).
- */
-@Composable
-fun durationLabel(minutes: Int): String {
-    val hours = minutes / 60
-    val rest = minutes % 60
-    val hoursLabel = pluralStringResource(R.plurals.duration_hours, hours, hours)
-    val minutesLabel = pluralStringResource(R.plurals.duration_minutes, rest, rest)
-    return when {
-        hours == 0 -> minutesLabel
-        rest == 0 -> hoursLabel
-        else -> stringResource(R.string.duration_hours_minutes, hoursLabel, minutesLabel)
-    }
-}