Mastodon
/
Bubble
mirror of https://github.com/lumaa-dev/BubbleApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better attachment view

This commit is contained in:
Lumaa 2024-02-24 13:24:14 +01:00
parent 9a99638896
commit 4767303b5c
3 changed files with 106 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Threaded/Data/Content/Status.swift
View File

@ -296,13 +296,13 @@ public struct MediaAttachment: Codable, Identifiable, Hashable, Equatable {
public let description: String?
public let meta: MetaContainer?
public static func imageWith(url: URL) -> MediaAttachment {
.init(id: UUID().uuidString,
type: "image",
url: url,
previewUrl: url,
description: "Alternative text",
meta: nil)
init(id: String, type: String, url: URL?, previewUrl: URL? = URL.placeholder, description: String? = nil, meta: MetaContainer? = nil) {
self.id = id
self.type = type
self.url = url
self.previewUrl = previewUrl
self.description = description
self.meta = meta
}
}

48
Threaded/Localizable.xcstrings
View File

@ -599,6 +599,22 @@
}
}
},
"attachment.next-image" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Show next image"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Afficher l'image suivante"
}
}
}
},
"attachment.no-attachments" : {
"localizations" : {
"en" : {
@ -615,6 +631,38 @@
}
}
},
"attachment.previous-image" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Show previous image"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Afficher l'image précédente"
}
}
}
},
"attachment.reset-move" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Restore position"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Restaurer la position"
}
}
}
},
"discovery" : {
"localizations" : {
"en" : {

56
Threaded/Views/AttachmentView.swift
View File

@ -137,8 +137,8 @@ struct AttachmentView: View {
}
}
.onChange(of: selectedId) { _, new in
currentZoom = 0
totalZoom = 1
currentZoom = 0.0
totalZoom = 1.0
currentPos = .zero
totalPos = .zero
}
@ -224,13 +224,13 @@ struct AttachmentView: View {
Text(String("ALT"))
.font(.body)
}
.disabled(selectedAttachment?.description?.isEmpty ?? true)
.opacity(selectedAttachment?.description?.isEmpty ?? true ? 0.3 : 1.0)
.realDisabled(selectedAttachment?.description?.isEmpty ?? true)
Divider()
.frame(height: 10)
Button {
guard AppDelegate.premium else { return }
Task {
let imgData = try await URLSession.shared.data(from: selectedAttachment?.url ?? URL.placeholder)
if let img = UIImage(data: imgData.0) {
@ -240,6 +240,46 @@ struct AttachmentView: View {
} label: {
Image(systemName: "square.and.arrow.down")
}
.realDisabled(!AppDelegate.premium)
Divider()
.frame(height: 10)
Menu {
Button {
withAnimation(.spring.speed(2.0)) {
currentPos = .zero
totalPos = .zero
currentZoom = 0.0
totalZoom = 1.0
}
} label: {
Label("attachment.reset-move", systemImage: "arrow.up.and.down.and.arrow.left.and.right")
}
Divider()
Button {
let currentIndex = attachments.firstIndex(where: { $0.id == selectedId }) ?? 0
let newIndex = loseIndex(currentIndex - 1, max: attachments.count - 1)
selectedId = attachments[newIndex].id
} label: {
Label("attachment.previous-image", systemImage: "arrowshape.left")
}
.disabled(attachments.count <= 1)
Button {
let currentIndex = attachments.firstIndex(where: { $0.id == selectedId }) ?? 0
let newIndex = loseIndex(currentIndex + 1, max: attachments.count - 1)
selectedId = attachments[newIndex].id
} label: {
Label("attachment.next-image", systemImage: "arrowshape.right")
}
.disabled(attachments.count <= 1)
} label: {
Image(systemName: "ellipsis")
.frame(height: 20)
}
}
.pill()
.padding()
@ -266,9 +306,15 @@ private extension View {
.background(Material.thin)
.clipShape(Capsule())
}
func realDisabled(_ bool: Bool) -> some View {
self
.disabled(bool)
.opacity(bool ? 0.3 : 1.0)
}
}
#Preview {
AttachmentView(attachments: [.init(id: "ABC", type: "photo", url: URL(string: "https://i.stack.imgur.com/HX3Aj.png"), previewUrl: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), description: String("This displays the TabView with a page indicator at the bottom"), meta: nil), .init(id: "DEF", type: "photo", url: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), previewUrl: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), description: nil, meta: nil)])
AttachmentView(attachments: [.init(id: "ABC", type: "image", url: URL(string: "https://i.stack.imgur.com/HX3Aj.png"), previewUrl: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), description: String("This displays the TabView with a page indicator at the bottom"), meta: nil), .init(id: "DEF", type: "image", url: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), previewUrl: URL(string: "https://cdn.pixabay.com/photo/2023/08/28/20/32/flower-8220018_1280.jpg"), description: nil, meta: nil)])
.environment(AppDelegate())
}