zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Show menu in an overlay rather than a ZStack, so that showing it does not change the metrics of the main view.

Browse Source
This commit is contained in:
shannon 2025-04-09 13:18:20 -04:00
parent 0be0568542
commit 727fad853f
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Mastodon/Scene/Notification/Notification Filtering/NotificationPolicyHostingViewController.swift
View File

@ -81,50 +81,49 @@ struct NotificationPolicyView: View {
private let menuPositionPrefKey = "menu"
var body: some View {
ZStack(alignment: Alignment(horizontal: .menuAlign, vertical: .menuAlign)) {
mainView()
.overlay {
ReferencePointReader(id: mainViewPositionPrefKey, referencePoint: .leadingTop)
}
.alignmentGuide(HorizontalAlignment.menuAlign) { d in
guard let menuAnchor else { return d[HorizontalAlignment.center] }
return menuAnchor.x
}
.alignmentGuide(VerticalAlignment.menuAlign) { d in
guard let menuAnchor else { return d[HorizontalAlignment.center] }
return menuAnchor.y
}
if readyToShowMenu, let menuItem = viewModel.isShowingMenu {
menu(for: menuItem)
.alignmentGuide(HorizontalAlignment.menuAlign) { d in
return d[HorizontalAlignment.trailing]
}
.alignmentGuide(VerticalAlignment.menuAlign) { d in
return d[VerticalAlignment.center]
}
mainView()
.overlay {
ReferencePointReader(id: mainViewPositionPrefKey, referencePoint: .leadingTop)
}
}
.onDisappear {
Task {
let updatedPolicy = try await viewModel.saveChanges()
viewModel.didDismissView?(updatedPolicy)
.alignmentGuide(HorizontalAlignment.menuAlign) { d in
guard let menuAnchor else { return d[HorizontalAlignment.center] }
return menuAnchor.x
}
}
.onPreferenceChange(PositionKey.self) { preferences in
menuAnchor = preferences.deltaFrom(mainViewPositionPrefKey, to: menuPositionPrefKey)
let canShowMenuNow = menuAnchor != nil
if canShowMenuNow != readyToShowMenu {
Task { @MainActor in
withAnimation {
readyToShowMenu = menuAnchor != nil
.alignmentGuide(VerticalAlignment.menuAlign) { d in
guard let menuAnchor else { return d[HorizontalAlignment.center] }
return menuAnchor.y
}
.overlay(alignment: Alignment(horizontal: .menuAlign, vertical: .menuAlign)) {
if readyToShowMenu, let menuItem = viewModel.isShowingMenu {
menu(for: menuItem)
.alignmentGuide(HorizontalAlignment.menuAlign) { d in
return d[HorizontalAlignment.trailing]
}
.alignmentGuide(VerticalAlignment.menuAlign) { d in
return d[VerticalAlignment.center]
}
}
}
.onDisappear {
Task {
let updatedPolicy = try await viewModel.saveChanges()
viewModel.didDismissView?(updatedPolicy)
}
}
.onPreferenceChange(PositionKey.self) { preferences in
menuAnchor = preferences.deltaFrom(mainViewPositionPrefKey, to: menuPositionPrefKey)
let canShowMenuNow = menuAnchor != nil
if canShowMenuNow != readyToShowMenu {
Task { @MainActor in
withAnimation {
readyToShowMenu = menuAnchor != nil
}
}
}
}
}
}
@ViewBuilder func mainView() -> some View {