From 5fd9392757d83c2bd414f8602076dd6cd3f294ca Mon Sep 17 00:00:00 2001 From: ocnc Date: Wed, 4 Mar 2026 21:13:02 -0500 Subject: [PATCH] Remove redundant keyboard toolbar button --- Spectty/Views/SessionCarouselView.swift | 52 ++++++++++--------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/Spectty/Views/SessionCarouselView.swift b/Spectty/Views/SessionCarouselView.swift index 37f7893..f1cab50 100644 --- a/Spectty/Views/SessionCarouselView.swift +++ b/Spectty/Views/SessionCarouselView.swift @@ -39,43 +39,35 @@ struct SessionCarouselView: View { .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .primaryAction) { - HStack(spacing: 12) { + Menu { Button { - dismissKeyboard() - } label: { - Image(systemName: "keyboard.chevron.compact.down") - } - - Menu { - Button { - if let session = sessionManager.activeSession { - UIPasteboard.general.string.map { text in - session.sendData(Data(text.utf8)) - } + if let session = sessionManager.activeSession { + UIPasteboard.general.string.map { text in + session.sendData(Data(text.utf8)) } - } label: { - Label("Paste", systemImage: "doc.on.clipboard") } + } label: { + Label("Paste", systemImage: "doc.on.clipboard") + } - Button { - if let session = sessionManager.activeSession { - renameText = session.connectionName - showRenameAlert = true - } - } label: { - Label("Rename", systemImage: "pencil") + Button { + if let session = sessionManager.activeSession { + renameText = session.connectionName + showRenameAlert = true } + } label: { + Label("Rename", systemImage: "pencil") + } - Divider() + Divider() - Button(role: .destructive) { - showDisconnectConfirm = true - } label: { - Label("Disconnect", systemImage: "xmark.circle") - } + Button(role: .destructive) { + showDisconnectConfirm = true } label: { - Image(systemName: "ellipsis.circle") + Label("Disconnect", systemImage: "xmark.circle") } + } label: { + Image(systemName: "ellipsis.circle") } } } @@ -119,10 +111,6 @@ struct SessionCarouselView: View { return session.title.isEmpty ? session.connectionName : session.title } - private func dismissKeyboard() { - UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil) - } - // MARK: - Edge Swipe private func handleEdgeSwipe(_ event: EdgeSwipeEvent, width: CGFloat) {