Skip to content

Remove redundant keyboard toolbar button #10

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

Merged
ocnc merged 1 commit into from
Mar 5, 2026
Merged

Remove redundant keyboard toolbar button #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 20 additions & 32 deletions Spectty/Views/SessionCarouselView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
Expand Down Expand Up @@ -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) {
Expand Down