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..2cb146b121 100644 --- a/Share/View/NCShareView.swift +++ b/Share/View/NCShareView.swift @@ -67,18 +67,36 @@ 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 { - 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) {