Conversation
Signed-off-by: Nikolai Berezovskii <nikolai@brzv.sk>
Owner
|
Merged as b268509. Rebased onto current main. The conflict was your shelfTheme meeting the favoritesEnabled setting from #15, so both are in now, and the migration from the old shelfProDark flag is intact. Two small things I changed. I put a doc comment back on the new property, since the one explaining the pro dark look got dropped with the old boolean. And I removed Scripts/Tests/AppearanceTests.swift. Your logic there was right, but nothing compiles that directory: the Copy target's sources are Copy and Copy/Assets.xcassets, and CI runs swift test against CopyCore only. The app layer has no test target at all, which is my gap to fix, not yours. Closing because the rebase changed the SHAs. Thanks! |
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this changes
Replaces Always Use Dark Shelf with Follow System / Light / Dark. The choice applies to the shelf, its modal windows, Paste Stack and its editor, and Settings. Existing Pro Dark users migrate to Dark; other users keep Follow System. Saved new choices take precedence over the legacy flag.
Independent PR; no merge dependencies. Paste Stack is retained.
How you tested it
Compiled and ran
Scripts/Tests/AppearanceTests.swiftwith the realCopy/Settings/SettingsStore.swift: both legacy values, all saved choices, restart persistence, invalid values, callback behavior and NSAppearance mappings passed.Command:
swiftc -parse-as-library Copy/Settings/SettingsStore.swift Scripts/Tests/AppearanceTests.swift -o /tmp/copy-appearance-tests && /tmp/copy-appearance-tests.Xcode Debug build and
git diff --checkpassed.Every commit is signed off.
All three SPM pins are preserved.