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.

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

Jump to bottom

Always show back button on mac catalyst #1225

Merged
merged 2 commits into from
Sep 1, 2024
Merged

Always show back button on mac catalyst #1225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc8f4f
Rename isCompact to shouldDisplayBackButton
matthewrfennell Aug 31, 2024
614347f
Always display back button on catalyst
matthewrfennell Aug 31, 2024
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
8 changes: 6 additions & 2 deletions Monal/Classes/SwiftuiHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,12 @@ struct AddTopLevelNavigation<Content: View>: View {
.navigationBarTitleDisplayMode(.automatic)
.navigationBarBackButtonHidden(true) // will not be shown because swiftui does not know we navigated here from UIKit
.toolbar {
let isCompact = UIUserInterfaceSizeClass(rawValue: sizeClass.horizontal) == .compact
if isCompact {
#if targetEnvironment(macCatalyst)
let shouldDisplayBackButton = true
#else
let shouldDisplayBackButton = UIUserInterfaceSizeClass(rawValue: sizeClass.horizontal) == .compact
#endif
if shouldDisplayBackButton {
ToolbarItem(placement: .topBarLeading) {
Button(action : {
self.delegate.dismiss()
Expand Down