Repository navigation
fix: use the system close button on iOS 26 - #126
Merged
Merged
Conversation
The Location Key check showed a gray xmark.circle.fill image inside the toolbar's own glass button, and forced a solid navigation bar. On iOS 26 and later, close buttons now use the system Liquid Glass close button: Button(role: .close) in the Location Key check and Settings toolbars, and a glass circle X on the saved-key card. The Location Key check also stops forcing a bar background. iOS 17 and 18 look the same as before. Closes #124.
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.
Closes #124.
What
Why
Apple's Toolbars guidelines:
The old X was an
xmark.circle.fillimage inside a toolbar button. On iOS 26 the toolbar already wraps every button in glass, so it showed as a gray filled circle inside a glass circle.How
CloseButtonusesButton(role: .close, action:)on iOS 26 and later..topBarTrailing, because.confirmationActionwould turn it into a blue, prominent confirm button..inlinevariant puts anxmarkin Apple's.glassbutton style with a circle shape.xmark.circle.fill.LocationUnlockViewdrops.toolbarBackground(.visible, for: .navigationBar)on iOS 26 and later.Tests
testLocationKeyCheckCanBeClosedWhenOutOfRange: with a location key far away (new-uiTestLocationKeyFarAwayseed), the check says "You're not in an unlock area". Close is labeled "Close" and returns to Choose Key.testLocationKeyInfoClosesWithTheCloseButton: tapping a saved key's area on the location map shows its card, and Close dismisses it.Screenshots before and after, in dark mode like the report, on an iPhone 17e (iOS 26.5), an iPhone Air (iOS 27) and an iPhone SE (iOS 17.5, unchanged).
Unit tests: 894/894. UI tests: 59/59. Both on the iPhone Air iOS 27.0 simulator, on main with feat: offer the Keys tab when an action needs a key #118, fix: scale schedule and group cards for large text #121 and fix: show every FAQ answer in full #122 merged. That includes fix: show every FAQ answer in full #122's FAQ truncation tests, which locate Settings' Close button and still find it now that it's the system X.