Repository navigation
Add edge fade to Files filter chips #13584
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/HorizontalEdgeFadePillBar.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #if os(iOS) | ||
| import SwiftUI | ||
| import UIKit | ||
|
|
||
| /// Hosts horizontally scrolling pills in a real UIKit scroll view while keeping | ||
| /// its fixed controls above the scrolling content at either edge. | ||
| struct HorizontalEdgeFadePillBar<Leading: View, Pills: View, Trailing: View>: UIViewControllerRepresentable { | ||
| let contentInsets: UIEdgeInsets | ||
| let accessibilityIdentifier: String | ||
| let leading: Leading | ||
| let pills: Pills | ||
| let trailing: Trailing | ||
|
|
||
| init( | ||
| contentInsets: UIEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8), | ||
| accessibilityIdentifier: String, | ||
| @ViewBuilder leading: () -> Leading, | ||
| @ViewBuilder pills: () -> Pills, | ||
| @ViewBuilder trailing: () -> Trailing | ||
| ) { | ||
| self.contentInsets = contentInsets | ||
| self.accessibilityIdentifier = accessibilityIdentifier | ||
| self.leading = leading() | ||
| self.pills = pills() | ||
| self.trailing = trailing() | ||
| } | ||
|
|
||
| func makeUIViewController(context: Context) -> HorizontalEdgeFadePillBarViewController<Leading, Pills, Trailing> { | ||
| HorizontalEdgeFadePillBarViewController( | ||
| contentInsets: contentInsets, | ||
| accessibilityIdentifier: accessibilityIdentifier, | ||
| leading: leading, | ||
| pills: pills, | ||
| trailing: trailing | ||
| ) | ||
| } | ||
|
|
||
| func updateUIViewController( | ||
| _ viewController: HorizontalEdgeFadePillBarViewController<Leading, Pills, Trailing>, | ||
| context: Context | ||
| ) { | ||
| viewController.update( | ||
| leading: leading, | ||
| pills: pills, | ||
| trailing: trailing | ||
| ) | ||
| } | ||
| } | ||
| #endif |
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
4 changes: 2 additions & 2 deletions
4
...oser/TaskComposerEdgeFadeScrollView.swift → ...hellUI/HorizontalEdgeFadeScrollView.swift
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
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
40 changes: 0 additions & 40 deletions
40
...es/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/TaskComposer/TaskComposerPillBar.swift
This file was deleted.
Oops, something went wrong.
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
24 changes: 24 additions & 0 deletions
24
Packages/iOS/CmuxMobileShellUI/Tests/CmuxMobileShellUITests/HorizontalEdgeFadeTests.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import Testing | ||
|
|
||
| @testable import CmuxMobileShellUI | ||
|
|
||
| @Suite("Horizontal edge fade") | ||
| struct HorizontalEdgeFadeTests { | ||
| @Test("edge stays opaque at rest") | ||
| func opaqueAtRest() { | ||
| #expect(HorizontalEdgeFadeScrollView.edgeAlpha(distance: 0) == 1) | ||
| #expect(HorizontalEdgeFadeScrollView.edgeAlpha(distance: -4) == 1) | ||
| } | ||
|
|
||
| @Test("fade ramps linearly as content approaches a control edge") | ||
| func incrementalRamp() { | ||
| #expect(abs(HorizontalEdgeFadeScrollView.edgeAlpha(distance: 6) - 0.75) < 0.0001) | ||
| #expect(abs(HorizontalEdgeFadeScrollView.edgeAlpha(distance: 12) - 0.5) < 0.0001) | ||
| } | ||
|
|
||
| @Test("fade saturates after one band") | ||
| func saturates() { | ||
| #expect(HorizontalEdgeFadeScrollView.edgeAlpha(distance: 24) == 0) | ||
| #expect(HorizontalEdgeFadeScrollView.edgeAlpha(distance: 500) == 0) | ||
| } | ||
| } |
24 changes: 0 additions & 24 deletions
24
Packages/iOS/CmuxMobileShellUI/Tests/CmuxMobileShellUITests/TaskComposerEdgeFadeTests.swift
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Keep the Files filter row at 44 points.
.frame(height: 34)is followed by.padding(.vertical, 10), sogalleryControlsoccupies 54 points. This adds 10 points to the row and pushes the divider and file content down. Adjust the inner height or padding so the combined layout height is 44 points.Proposed fix
📝 Committable suggestion
🤖 Prompt for AI Agents