shadowfacts/Tusker
1
10
Fork 2
Code Issues 76 Pull Requests Releases Wiki Activity

Don't use context menu on attachment cell, since it blocks reordering

Browse Source
This commit is contained in:
Shadowfacts 2025-02-07 11:44:11 -05:00
parent 558675842a
commit 16dabd5d9f
2 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ComposeUI/Sources/ComposeUI/Views/AttachmentThumbnailView.swift
View File

@ -46,6 +46,9 @@ private struct AttachmentThumbnailViewContent: View {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: contentMode)
.task(id: attachment.drawingData) {
await loadThumbnail()
}
case .gifController(let controller):
GIFViewWrapper(controller: controller)
}

68
Packages/ComposeUI/Sources/ComposeUI/Views/Attachments/AttachmentCollectionViewCell.swift
View File

@ -23,28 +23,36 @@ struct AttachmentCollectionViewCellView: View {
.fill(.quaternary)
}
.overlay(alignment: .bottomLeading) {
if recognizingText {
ProgressView()
.progressViewStyle(.circular)
} else {
AttachmentDescriptionLabel(attachment: attachment)
}
AttachmentDescriptionLabel(attachment: attachment, recognizingText: recognizingText)
}
.overlay(alignment: .topLeading) {
AttachmentOptionsMenu(attachment: attachment, recognizingText: $recognizingText)
}
.overlay(alignment: .topTrailing) {
AttachmentRemoveButton(attachment: attachment)
}
.clipShape(RoundedSquare(cornerRadius: 5))
// TODO: context menu preview?
.contextMenu {
if attachment.drawingData != nil {
EditDrawingButton(attachment: attachment)
} else if attachment.type == .image {
RecognizeTextButton(attachment: attachment, recognizingText: $recognizingText)
}
}
}
}
}
private struct AttachmentOptionsMenu: View {
let attachment: DraftAttachment
@Binding var recognizingText: Bool
var body: some View {
Menu {
if attachment.drawingData != nil {
EditDrawingButton(attachment: attachment)
} else if attachment.type == .image {
RecognizeTextButton(attachment: attachment, recognizingText: $recognizingText)
}
} label: {
Label("Options", systemImage: "ellipsis.circle.fill")
}
.buttonStyle(AttachmentOverlayButtonStyle())
.padding([.top, .leading], 2)
}
}
private struct RecognizeTextButton: View {
@ -138,29 +146,47 @@ private struct AttachmentRemoveButton: View {
draft.attachments = attachments
DraftsPersistentContainer.shared.viewContext.delete(attachment)
}
.labelStyle(.iconOnly)
.imageScale(.large)
.foregroundStyle(.white)
.shadow(radius: 2)
.buttonStyle(AttachmentOverlayButtonStyle())
.padding([.top, .trailing], 2)
}
}
private struct AttachmentOverlayButtonStyle: ButtonStyle {
func makeBody(configuration: Configuration) -> some View {
configuration.label
.labelStyle(.iconOnly)
.imageScale(.large)
.foregroundStyle(.white)
.shadow(radius: 2)
}
}
private struct AttachmentDescriptionLabel: View {
@ObservedObject var attachment: DraftAttachment
let recognizingText: Bool
var body: some View {
ZStack(alignment: .bottomLeading) {
LinearGradient(
stops: [.init(color: .clear, location: 0), .init(color: .clear, location: 0.6), .init(color: .black.opacity(0.5), location: 1)],
stops: [.init(color: .clear, location: 0.6), .init(color: .black.opacity(0.15), location: 0.7), .init(color: .black.opacity(0.5), location: 1)],
startPoint: .top,
endPoint: .bottom
)
labelOrProgress
.padding([.horizontal, .bottom], 4)
}
}
@ViewBuilder
private var labelOrProgress: some View {
if recognizingText {
ProgressView()
.progressViewStyle(.circular)
} else {
label
.foregroundStyle(.white)
.shadow(color: .black.opacity(0.5), radius: 1)
.padding([.horizontal, .bottom], 4)
.shadow(color: .black.opacity(0.75), radius: 1)
}
}