christophergyman 3b73a092d1 Merge origin/main into feat-spotify ...

Resolve conflict in ContentView.swift by keeping both TodosView and SettingsView tabs.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2026-01-10 21:05:54 +00:00

..

BleStatusView.swift

add wifi request ble characteristic

2026-01-10 14:23:39 +00:00

CandidatesView.swift

Refactor data sources and feed model

2026-01-10 00:25:36 +00:00

OrchestratorView.swift

Move POI alerts to FYI

2026-01-10 19:35:55 +00:00

SettingsView.swift

Add UI to configure Spotify Client ID in Settings

2026-01-10 20:52:31 +00:00

TodosView.swift

Add todo CRUD tab in companion app

2026-01-10 20:20:32 +00:00