Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion Maccy/Models/HistoryItem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,17 @@ class HistoryItem {
return data
}

var imageDimensionsValue: String? {
if let data = imageData, let rep = NSBitmapImageRep(data: data) {
return "\(rep.pixelsWide)×\(rep.pixelsHigh)"
}
if let url = fileURLs.first, let data = try? Data(contentsOf: url),
let rep = NSBitmapImageRep(data: data) {
return "\(rep.pixelsWide)×\(rep.pixelsHigh)"
}
return nil
}

var image: NSImage? {
guard let data = imageData else {
return nil
Expand Down Expand Up @@ -220,7 +231,7 @@ class HistoryItem {

let requestHandler = VNImageRequestHandler(cgImage: cgImage)
let request = VNRecognizeTextRequest(completionHandler: recognizeTextHandler)
request.recognitionLevel = .fast
request.recognitionLevel = .accurate

do {
try requestHandler.perform([request])
Expand Down
4 changes: 4 additions & 0 deletions Maccy/Observables/HistoryItemDecorator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class HistoryItemDecorator: Identifiable, Hashable, HasVisibility {

var hasImage: Bool { item.image != nil }

var imageDimensions: String? {
item.imageDimensionsValue
}

var previewImageGenerationTask: Task<(), Error>?
var thumbnailImageGenerationTask: Task<(), Error>?
var previewImage: NSImage?
Expand Down
25 changes: 25 additions & 0 deletions Maccy/Views/PreviewItemView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ struct PreviewItemView: View {
previewImage {
Image(nsImage: image)
.resizable()
.overlay(alignment: .bottomTrailing) {
if let dim = item.item.imageDimensionsValue {
Text(dim)
.font(.caption2)
.foregroundStyle(.white)
.padding(.horizontal, 4)
.padding(.vertical, 2)
.background(.black.opacity(0.5), in: .rect(cornerRadius: 3))
.padding(4)
}
}
}
} else {
previewImage {
Expand Down Expand Up @@ -88,6 +99,20 @@ struct PreviewItemView: View {
Text("NumberOfCopies", tableName: "PreviewItemView")
Text(String(item.item.numberOfCopies))
}

if let dim = item.item.imageDimensionsValue {
HStack(spacing: 3) {
Text("ImageDimensions", tableName: "PreviewItemView")
Text(dim)
}
}

if !item.item.title.isEmpty {
HStack(spacing: 3) {
Text("Title", tableName: "PreviewItemView")
Text(item.item.title)
}
}
}
.controlSize(.small)
}
Expand Down
2 changes: 2 additions & 0 deletions Maccy/Views/en.lproj/PreviewItemView.strings
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"FirstCopyTime" = "First copy time:";
"LastCopyTime" = "Last copy time:";
"NumberOfCopies" = "Number of copies:";
"ImageDimensions" = "Dimensions:";
"Title" = "Title:";
"PinKey" = "Press {pinKey} to pin.";
"UnpinKey" = "Press {pinKey} to unpin.";
"DeleteKey" = "Press {deleteKey} to delete.";
Expand Down