Skip to content

refactor(desktop): move iCloud to Cloud sub-option in sync settings#332

Merged
dongdongbh merged 1 commit intodongdongbh:mainfrom
joshuaferris:ui/icloud-settings-button
Mar 30, 2026
Merged

refactor(desktop): move iCloud to Cloud sub-option in sync settings#332
dongdongbh merged 1 commit intodongdongbh:mainfrom
joshuaferris:ui/icloud-settings-button

Conversation

@joshuaferris
Copy link
Copy Markdown
Contributor

Summary

  • Moves iCloud from a top-level sync backend button to a sub-option under Cloud (alongside Self-Hosted and Dropbox)
  • Renames top-level button from "Self-Hosted" to "Cloud" (EN) / "云端" (ZH)
  • No sync-service changes — cloudkit remains its own SyncBackend value internally

Split out from #326 per review feedback. This is a pure UI cleanup with no native code changes.

Test plan

  • Cloud button highlights when backend is cloud or cloudkit
  • Sub-buttons: Self-Hosted, Dropbox, iCloud (macOS only) all toggle correctly
  • Selecting iCloud sets backend to cloudkit; selecting Self-Hosted/Dropbox sets backend to cloud
  • Non-macOS: iCloud sub-button hidden

🤖 Generated with Claude Code

Moves the iCloud sync button from a top-level backend option to a
sub-option under the Cloud backend, alongside Self-Hosted and Dropbox.
Renames the top-level button from "Self-Hosted" to "Cloud" since it
now groups multiple cloud providers.

- Set cloudProvider before syncBackend to avoid race where a sync
  cycle starts with the old provider value
- Only call onSetSyncBackend when actually switching backends (skip
  when already on 'cloud')
- Add iCloud info panel ("No setup required") so the UI isn't empty
  when cloudkit is selected
- No sync-service changes — cloudkit remains its own SyncBackend value
  internally; only the UI grouping changes

Co-Authored-By: Claude Opus 4.6 <[email protected]>
@joshuaferris joshuaferris force-pushed the ui/icloud-settings-button branch from 7bc9e0b to 267f9e5 Compare March 29, 2026 16:35
Copy link
Copy Markdown
Owner

@dongdongbh dongdongbh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to merge

  • The UI regrouping is directionally right and keeps sync choices simpler at the top level.
  • I rechecked the desktop settings path locally and the cloud/cloudkit selection logic looks consistent.

@dongdongbh dongdongbh merged commit 5b96e99 into dongdongbh:main Mar 30, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants