Skip to content
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
6 changes: 2 additions & 4 deletions iOSClient/Main/NCMainNavigationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,9 @@ class NCMainNavigationController: UINavigationController, UINavigationController
if let loadingItem, loadingIndicator?.isAnimating == true {
items.append(loadingItem)
}
// Match Media: each item has its own group; only the sidebar is always available.
// Each item can move independently into UIKit's overflow menu.
navigationItem.leadingItemGroups = items.map { item in
let group = UIBarButtonItemGroup(barButtonItems: [item], representativeItem: nil)
group.alwaysAvailable = item === sidebarButtonItem
return group
UIBarButtonItemGroup(barButtonItems: [item], representativeItem: nil)
}
}

Expand Down
4 changes: 1 addition & 3 deletions iOSClient/Media/NCMediaNavigationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ class NCMediaNavigationController: NCMainNavigationController {
items.append(media.searchActivityBarButtonItem)
}
media.navigationItem.leadingItemGroups = items.map { item in
let group = UIBarButtonItemGroup(barButtonItems: [item], representativeItem: nil)
group.alwaysAvailable = item === sidebarButtonItem
return group
UIBarButtonItemGroup(barButtonItems: [item], representativeItem: nil)
}
}

Expand Down
Loading