Skip to content
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

AboutView Animation Improvements #1915

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct AcknowledgementsView: View {

var body: some View {
AboutDetailView(title: "Acknowledgements", aboutMode: $aboutMode, namespace: namespace) {
VStack(spacing: 0) {
LazyVStack(spacing: 0) {
ForEach(
model.indexedAcknowledgements,
id: \.acknowledgement.name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct ContributorsView: View {

var body: some View {
AboutDetailView(title: "Contributors", aboutMode: $aboutMode, namespace: namespace) {
VStack(spacing: 0) {
LazyVStack(spacing: 0) {
ForEach(model.contributors) { contributor in
ContributorRowView(contributor: contributor)
Divider()
Expand Down
5 changes: 5 additions & 0 deletions CodeEdit/Features/About/Views/AboutDefaultView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ struct AboutDefaultView: View {
VStack(spacing: 0) {
Text("CodeEdit")
.matchedGeometryEffect(id: "Title", in: namespace, properties: .position, anchor: .center)
.blur(radius: aboutMode == .about ? 0 : 10)
.foregroundColor(.primary)
.font(.system(
size: 26,
Expand All @@ -61,6 +62,8 @@ struct AboutDefaultView: View {
properties: .position,
anchor: UnitPoint(x: 0.5, y: -0.75)
)
.blur(radius: aboutMode == .about ? 0 : 10)
.opacity(aboutMode == .about ? 1 : 0)
}
.padding(.horizontal)
}
Expand Down Expand Up @@ -106,6 +109,8 @@ struct AboutDefaultView: View {
}
.matchedGeometryEffect(id: "Titlebar", in: namespace, properties: .position, anchor: .top)
.matchedGeometryEffect(id: "ScrollView", in: namespace, properties: .position, anchor: .top)
.blur(radius: aboutMode == .about ? 0 : 10)
.opacity(aboutMode == .about ? 1 : 0)
}
.padding(.horizontal)
}
Expand Down
14 changes: 13 additions & 1 deletion CodeEdit/Features/About/Views/AboutDetailView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ struct AboutDetailView<Content: View>: View {
}
.frame(maxWidth: .infinity)
.matchedGeometryEffect(id: "ScrollView", in: namespace, properties: .position, anchor: .top)
.blur(radius: aboutMode != .about ? 0 : 10)
.opacity(aboutMode != .about ? 1 : 0)
.clipShape(Rectangle())
}

Expand Down Expand Up @@ -113,6 +115,8 @@ struct AboutDetailView<Content: View>: View {
}
.contentShape(Rectangle())
.matchedGeometryEffect(id: "Title", in: namespace, properties: .position, anchor: .center)
.blur(radius: aboutMode != .about ? 0 : 10)
.opacity(aboutMode != .about ? 1 : 0)
}
.buttonStyle(.plain)

Expand All @@ -135,9 +139,17 @@ struct AboutDetailView<Content: View>: View {
minOffset: CGFloat,
maxOffset: CGFloat
) -> CGFloat {
let currentOffset = scrollOffset
let threshold: CGFloat = 1.0

/// Prevents unnecessary view updates if the scroll offset is below the threshold
if abs(currentOffset) < threshold {
return minValue
}

let valueRange = maxValue - minValue
let offsetRange = maxOffset - minOffset
let currentOffset = scrollOffset

let percentage = (currentOffset - minOffset) / offsetRange
let value = minValue + (valueRange * percentage)

Expand Down
2 changes: 1 addition & 1 deletion CodeEdit/Features/About/Views/AboutView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public struct AboutView: View {
ContributorsView(aboutMode: $aboutMode, namespace: animator)
}
}
.animation(.spring(), value: aboutMode)
.animation(.smooth, value: aboutMode)
.ignoresSafeArea()
.frame(width: 280, height: 400 - 28)
.fixedSize()
Expand Down
Loading