Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial implementation

This commit is contained in:
Marcin Czachurski 2023-05-05 18:36:15 +02:00
parent 8d76cfdcd3
commit f2d8c5c47f
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Vernissage/Views/UserProfileView/Subviews/UserProfileStatusesView.swift
View File

@ -26,10 +26,12 @@ struct UserProfileStatusesView: View {
private let imagePrefetcher = ImagePrefetcher(destination: .diskCache)
var body: some View {
LazyVStack(alignment: .center) {
if firstLoadFinished == true {
// LazyVStack(alignment: .center) {
if firstLoadFinished == true {
LazyVGrid(columns: [GridItem(.flexible(), spacing: 10), GridItem(.flexible(), spacing: 0)], spacing: 5) {
ForEach(self.statusViewModels, id: \.id) { item in
ImageRowAsync(statusViewModel: item, withAvatar: false)
ImageRowAsync(statusViewModel: item, withAvatar: false, clipToSquare: true)
.frame(width: UIScreen.main.bounds.width / 2, height: UIScreen.main.bounds.width / 2)
}
if allItemsLoaded == false && firstLoadFinished == true {
@ -46,16 +48,16 @@ struct UserProfileStatusesView: View {
Spacer()
}
}
} else {
LoadingIndicator()
}
}
.onFirstAppear {
do {
try await self.loadStatuses()
} catch {
ErrorService.shared.handle(error, message: "global.error.errorDuringDownloadStatuses", showToastr: !Task.isCancelled)
}
} else {
LoadingIndicator()
.onFirstAppear {
do {
try await self.loadStatuses()
} catch {
ErrorService.shared.handle(error, message: "global.error.errorDuringDownloadStatuses", showToastr: !Task.isCancelled)
}
}
}
}

24
Vernissage/Widgets/ImageRowAsync.swift
View File

@ -14,13 +14,15 @@ struct ImageRowAsync: View {
private let statusViewModel: StatusModel
private let firstAttachment: AttachmentModel?
private let showAvatar: Bool
private let clipToSquare: Bool
@State private var selected: String
@State private var imageHeight: Double
@State private var imageWidth: Double
init(statusViewModel: StatusModel, withAvatar showAvatar: Bool = true) {
init(statusViewModel: StatusModel, withAvatar showAvatar: Bool = true, clipToSquare: Bool = false) {
self.showAvatar = showAvatar
self.clipToSquare = clipToSquare
self.statusViewModel = statusViewModel
self.firstAttachment = statusViewModel.mediaAttachments.first
self.selected = String.empty()
@ -44,7 +46,11 @@ struct ImageRowAsync: View {
var body: some View {
if statusViewModel.mediaAttachments.count == 1, let firstAttachment = self.firstAttachment {
ImageRowItemAsync(statusViewModel: self.statusViewModel, attachment: firstAttachment, withAvatar: self.showAvatar) { (imageWidth, imageHeight) in
ImageRowItemAsync(statusViewModel: self.statusViewModel,
attachment: firstAttachment,
withAvatar: self.showAvatar,
clipToSquare: self.clipToSquare) { (imageWidth, imageHeight) in
// When we download image and calculate real size we have to change view size.
if imageWidth != self.imageWidth || imageHeight != self.imageHeight {
withAnimation(.linear(duration: 0.4)) {
@ -53,11 +59,17 @@ struct ImageRowAsync: View {
}
}
}
.frame(width: self.imageWidth, height: self.imageHeight)
.if(self.clipToSquare == false) {
$0.frame(width: self.imageWidth, height: self.imageHeight)
}
} else {
TabView(selection: $selected) {
ForEach(statusViewModel.mediaAttachments, id: \.id) { attachment in
ImageRowItemAsync(statusViewModel: self.statusViewModel, attachment: attachment, withAvatar: self.showAvatar) { (imageWidth, imageHeight) in
ImageRowItemAsync(statusViewModel: self.statusViewModel,
attachment: attachment,
withAvatar: self.showAvatar,
clipToSquare: self.clipToSquare) { (imageWidth, imageHeight) in
// When we download image and calculate real size we have to change view size (only when image is now visible).
if attachment.id == self.selected {
if imageWidth != self.imageWidth || imageHeight != self.imageHeight {
@ -86,7 +98,9 @@ struct ImageRowAsync: View {
}
}
})
.frame(width: self.imageWidth, height: self.imageHeight)
.if(self.clipToSquare == false) {
$0.frame(width: self.imageWidth, height: self.imageHeight)
}
.tabViewStyle(.page(indexDisplayMode: .never))
.overlay(CustomPageTabViewStyleView(pages: self.statusViewModel.mediaAttachments, currentId: $selected))
}

11
Vernissage/Widgets/ImageRowItemAsync.swift
View File

@ -21,6 +21,7 @@ struct ImageRowItemAsync: View {
private var statusViewModel: StatusModel
private var attachment: AttachmentModel
private let showAvatar: Bool
private let clipToSquare: Bool
private let imageFromCache: Bool
@State private var showThumbImage = false
@ -31,8 +32,11 @@ struct ImageRowItemAsync: View {
init(statusViewModel: StatusModel,
attachment: AttachmentModel,
withAvatar showAvatar: Bool = true, onImageDownloaded: @escaping (_: Double, _: Double) -> Void) {
withAvatar showAvatar: Bool = true,
clipToSquare: Bool = false,
onImageDownloaded: @escaping (_: Double, _: Double) -> Void) {
self.showAvatar = showAvatar
self.clipToSquare = clipToSquare
self.statusViewModel = statusViewModel
self.attachment = attachment
self.onImageDownloaded = onImageDownloaded
@ -149,7 +153,10 @@ struct ImageRowItemAsync: View {
private func imageView(image: Image) -> some View {
image
.resizable()
.aspectRatio(contentMode: .fit)
.scaledToFill()
.if(self.clipToSquare) {
$0.frame(width: UIScreen.main.bounds.width / 2, height: UIScreen.main.bounds.width / 2).clipped()
}
.onTapGesture(count: 2) {
Task {
// Update favourite in Pixelfed server.