Skip to content

Polish drawer open state and transition #127

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.

Sign up for GitHub

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
austin-smith merged 1 commit into from
Jul 12, 2026
Merged

Polish drawer open state and transition #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions BitDream/Views/iOS/iOSContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ enum iOSNavigationRoute: Hashable {

struct iOSContentView: View {
@Environment(\.hapticFeedback) private var hapticFeedback
@Environment(\.colorScheme) private var colorScheme

let hosts: [Host]
@ObservedObject var store: TransmissionStore
Expand Down Expand Up @@ -157,17 +158,18 @@ private extension iOSContentView {
hapticFeedback.play(.selectionChanged)
}
.overlay {
if progress > 0 {
// White scrim fades the card toward the background; also catches taps/drags to close
Color(.systemBackground)
.opacity(0.55 * progress)
.ignoresSafeArea()
.contentShape(.rect)
.onTapGesture {
closeSidebar()
}
.gesture(closeDragGesture(drawerWidth: drawerWidth))
}
// Scrim doubles as elevation: light mode fades the card toward white,
// dark mode lifts it to a slightly lighter surface; also catches taps/drags to close.
// Always present (opacity-only changes) — structural insertion would render it at the
// animation's destination instead of riding the card.
(colorScheme == .dark ? Color(white: 0.2) : Color(.systemBackground))
.opacity(0.55 * progress)
.contentShape(.rect)
.onTapGesture {
closeSidebar()
}
.gesture(closeDragGesture(drawerWidth: drawerWidth))
.allowsHitTesting(progress > 0)
}
.overlay(alignment: .leading) {
if !isSidebarOpen && navigationPath.isEmpty {
Expand All @@ -178,13 +180,9 @@ private extension iOSContentView {
}
}
.clipShape(RoundedRectangle(cornerRadius: 32 * progress, style: .continuous))
.overlay(
// Shadows vanish on black backgrounds; this edge keeps the card separated in dark mode
RoundedRectangle(cornerRadius: 32 * progress, style: .continuous)
.strokeBorder(Color(.separator).opacity(Double(progress)), lineWidth: 1)
)
.shadow(color: .black.opacity(0.12 * progress), radius: 12)
.offset(x: drawerWidth * progress)
.geometryGroup()
}

func openDragGesture(drawerWidth: CGFloat) -> some Gesture {
Expand Down Expand Up @@ -346,8 +344,10 @@ private extension iOSContentView {
Button {
toggleSidebar()
} label: {
// Bar glyphs ghost harder than the scrim alone while the drawer is open
SidebarToggleGlyph()
}
.tint(Color.primary.opacity(isSidebarOpen && colorScheme == .light ? 0.5 : 1))
.accessibilityLabel("Menu")
}
}
Expand All @@ -363,6 +363,7 @@ private extension iOSContentView {
})
} label: {
Image(systemName: "ellipsis.circle")
.foregroundStyle(Color.primary.opacity(isSidebarOpen && colorScheme == .light ? 0.5 : 1))
}
.iOSHapticControlActivation()
}
Expand Down
Loading