From 26577074cc99d1026fc4b5c33039544279e31457 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Fri, 13 Nov 2026 09:26:06 +0100 Subject: [PATCH 1/2] fix: improve Share toolbar layout on iOS 27.1 Separate the account menu and refresh spinner into horizontal toolbar items, prioritizing account visibility. Bump the build number to 2. Signed-off-by: Marino Faggiana --- Nextcloud.xcodeproj/project.pbxproj | 4 ++-- Share/View/NCShareView.swift | 33 +++++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj index 6ae48fe967..df72a92be1 100644 --- a/Nextcloud.xcodeproj/project.pbxproj +++ b/Nextcloud.xcodeproj/project.pbxproj @@ -6667,7 +6667,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = NKUJUXUJ3B; @@ -6735,7 +6735,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = NKUJUXUJ3B; diff --git a/Share/View/NCShareView.swift b/Share/View/NCShareView.swift index c53dea4305..0723074ac3 100644 --- a/Share/View/NCShareView.swift +++ b/Share/View/NCShareView.swift @@ -68,17 +68,28 @@ struct NCShareView: View { .toolbar(.visible, for: .navigationBar) .toolbarBackground(.hidden, for: .navigationBar) .toolbar { - ToolbarItemGroup(placement: .topBarLeading) { - if canShowContent { - HStack(spacing: 8) { - NCShareAccountMenu(model: model) - .disabled(model.isLoading || model.isPreparingUpload || model.isSwitchingAccount || model.isLoadingAccounts) - if isRefreshing { - ProgressView() - .accessibilityLabel(NSLocalizedString("_request_in_progress_", comment: "")) - .padding(.trailing, 8) - } - } + if canShowContent { + let account = ToolbarItem(placement: .topBarLeading) { + NCShareAccountMenu(model: model) + .disabled(model.isLoading || model.isPreparingUpload || model.isSwitchingAccount || model.isLoadingAccounts) + } + if #available(iOS 27.1, *) { + account.axisBehavior(.horizontalOnly) + .visibilityPriority(.high) + } else { + account + } + } + if canShowContent && isRefreshing { + let spinner = ToolbarItem(placement: .topBarLeading) { + ProgressView() + .controlSize(.regular) + .accessibilityLabel(NSLocalizedString("_request_in_progress_", comment: "")) + } + if #available(iOS 27.1, *) { + spinner.axisBehavior(.horizontalOnly) + } else { + spinner } } ToolbarItem(placement: .topBarTrailing) { From b6dbecd4088b96bdd010d3e0511e64fc0e568d84 Mon Sep 17 00:00:00 2001 From: Marino Faggiana Date: Fri, 13 Nov 2026 09:36:16 +0100 Subject: [PATCH 2/2] fix: prevent Share navigation bar minimization on iOS 27.0.1+ Signed-off-by: Marino Faggiana --- Share/View/NCShareView.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Share/View/NCShareView.swift b/Share/View/NCShareView.swift index 0723074ac3..2cb146b121 100644 --- a/Share/View/NCShareView.swift +++ b/Share/View/NCShareView.swift @@ -67,6 +67,13 @@ struct NCShareView: View { .navigationBarTitleDisplayMode(.inline) .toolbar(.visible, for: .navigationBar) .toolbarBackground(.hidden, for: .navigationBar) + .complexModifier { content in + if #available(iOS 27.0.1, *) { + content.toolbarMinimizationBehavior(.never, for: .navigationBar) + } else { + content + } + } .toolbar { if canShowContent { let account = ToolbarItem(placement: .topBarLeading) {