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

Fixes

This commit is contained in:
Marcin Czachursk 2023-01-13 21:11:30 +01:00
parent c1fb80e2bb
commit 43affaa868
13 changed files with 207 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Vernissage.xcodeproj/project.pbxproj
View File

@ -75,6 +75,7 @@
F897978D2968369600B22335 /* HapticService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897978C2968369600B22335 /* HapticService.swift */; };
F897978F29684BCB00B22335 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897978E29684BCB00B22335 /* LoadingView.swift */; };
F8984E4D296B648000A2610F /* UIImage+Blurhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8984E4C296B648000A2610F /* UIImage+Blurhash.swift */; };
F8996DEB2971D29D0043EEC6 /* View+Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8996DEA2971D29D0043EEC6 /* View+Transition.swift */; };
F89992C7296D3DF8005994BF /* MastodonKit in Frameworks */ = {isa = PBXBuildFile; productRef = F89992C6296D3DF8005994BF /* MastodonKit */; };
F89992C9296D6DC7005994BF /* CommentBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89992C8296D6DC7005994BF /* CommentBody.swift */; };
F89992CC296D9231005994BF /* StatusViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89992CB296D9231005994BF /* StatusViewModel.swift */; };
@ -85,6 +86,8 @@
F89D6C4229717FDC001DA3D4 /* AccountsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89D6C4129717FDC001DA3D4 /* AccountsSection.swift */; };
F89D6C4429718092001DA3D4 /* AccentsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89D6C4329718092001DA3D4 /* AccentsSection.swift */; };
F89D6C4629718193001DA3D4 /* ThemeSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89D6C4529718193001DA3D4 /* ThemeSection.swift */; };
F89D6C4A297196FF001DA3D4 /* ImagesViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89D6C49297196FF001DA3D4 /* ImagesViewer.swift */; };
F89D6C4C297197FE001DA3D4 /* ImageViewerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89D6C4B297197FE001DA3D4 /* ImageViewerViewModel.swift */; };
F8A93D7E2965FD89001D8331 /* UserProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A93D7D2965FD89001D8331 /* UserProfileView.swift */; };
F8A93D802965FED4001D8331 /* AccountService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A93D7F2965FED4001D8331 /* AccountService.swift */; };
F8C14392296AF0B3001FE31D /* String+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C14391296AF0B3001FE31D /* String+Exif.swift */; };
@ -162,6 +165,7 @@
F897978C2968369600B22335 /* HapticService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticService.swift; sourceTree = "<group>"; };
F897978E29684BCB00B22335 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
F8984E4C296B648000A2610F /* UIImage+Blurhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Blurhash.swift"; sourceTree = "<group>"; };
F8996DEA2971D29D0043EEC6 /* View+Transition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Transition.swift"; sourceTree = "<group>"; };
F89992C8296D6DC7005994BF /* CommentBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentBody.swift; sourceTree = "<group>"; };
F89992CB296D9231005994BF /* StatusViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusViewModel.swift; sourceTree = "<group>"; };
F89992CD296D92E7005994BF /* AttachmentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentViewModel.swift; sourceTree = "<group>"; };
@ -172,6 +176,8 @@
F89D6C4129717FDC001DA3D4 /* AccountsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSection.swift; sourceTree = "<group>"; };
F89D6C4329718092001DA3D4 /* AccentsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccentsSection.swift; sourceTree = "<group>"; };
F89D6C4529718193001DA3D4 /* ThemeSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeSection.swift; sourceTree = "<group>"; };
F89D6C49297196FF001DA3D4 /* ImagesViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesViewer.swift; sourceTree = "<group>"; };
F89D6C4B297197FE001DA3D4 /* ImageViewerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewerViewModel.swift; sourceTree = "<group>"; };
F8A93D7D2965FD89001D8331 /* UserProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileView.swift; sourceTree = "<group>"; };
F8A93D7F2965FED4001D8331 /* AccountService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountService.swift; sourceTree = "<group>"; };
F8AF2A61297073FE00D2DA3F /* Vernissage20230112-001.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Vernissage20230112-001.xcdatamodel"; sourceTree = "<group>"; };
@ -233,6 +239,7 @@
F8210DE62966E1D1001D9973 /* Color+Assets.swift */,
F8C14393296AF21B001FE31D /* Double+Round.swift */,
F8984E4C296B648000A2610F /* UIImage+Blurhash.swift */,
F8996DEA2971D29D0043EEC6 /* View+Transition.swift */,
);
path = Extensions;
sourceTree = "<group>";
@ -283,6 +290,8 @@
F83901A2295D863B00456AE2 /* Widgets */ = {
isa = PBXGroup;
children = (
F89D6C4829718868001DA3D4 /* StatusView */,
F89D6C4729718822001DA3D4 /* UserProfile */,
F89D6C4029717FC0001DA3D4 /* SettingsView */,
F83901A5295D8EC000456AE2 /* LabelIcon.swift */,
F85D4972296406E700751DF7 /* BottomRight.swift */,
@ -291,16 +300,12 @@
F85D497829640B9D00751DF7 /* ImagesCarousel.swift */,
F85D497A29640C8200751DF7 /* UsernameRow.swift */,
F85D497C29640D5900751DF7 /* InteractionRow.swift */,
F85D497E296416C800751DF7 /* CommentsSection.swift */,
F897978729681B9C00B22335 /* UserAvatar.swift */,
F89797892968314A00B22335 /* LoadingIndicator.swift */,
F86B7213296BFDCE00EE59EC /* UserProfileHeader.swift */,
F86B7215296BFFDA00EE59EC /* UserProfileStatuses.swift */,
F86B7217296C27C100EE59EC /* ActionButton.swift */,
F86B721D296C458700EE59EC /* BlurredImage.swift */,
F86B7222296C4BF500EE59EC /* ContentWarning.swift */,
F89992C8296D6DC7005994BF /* CommentBody.swift */,
F89A46DD296EABA20062125F /* StatusPlaceholder.swift */,
F89D6C49297196FF001DA3D4 /* ImagesViewer.swift */,
);
path = Widgets;
sourceTree = "<group>";
@ -406,6 +411,7 @@
children = (
F89992CB296D9231005994BF /* StatusViewModel.swift */,
F89992CD296D92E7005994BF /* AttachmentViewModel.swift */,
F89D6C4B297197FE001DA3D4 /* ImageViewerViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
@ -420,6 +426,25 @@
path = SettingsView;
sourceTree = "<group>";
};
F89D6C4729718822001DA3D4 /* UserProfile */ = {
isa = PBXGroup;
children = (
F86B7213296BFDCE00EE59EC /* UserProfileHeader.swift */,
F86B7215296BFFDA00EE59EC /* UserProfileStatuses.swift */,
);
path = UserProfile;
sourceTree = "<group>";
};
F89D6C4829718868001DA3D4 /* StatusView */ = {
isa = PBXGroup;
children = (
F85D497E296416C800751DF7 /* CommentsSection.swift */,
F89992C8296D6DC7005994BF /* CommentBody.swift */,
F89A46DD296EABA20062125F /* StatusPlaceholder.swift */,
);
path = StatusView;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -540,6 +565,7 @@
F80048032961850500E6868A /* AttachmentData+CoreDataClass.swift in Sources */,
F897978D2968369600B22335 /* HapticService.swift in Sources */,
F8341F90295C636C009C8EE6 /* Data+Exif.swift in Sources */,
F89D6C4A297196FF001DA3D4 /* ImagesViewer.swift in Sources */,
F8A93D7E2965FD89001D8331 /* UserProfileView.swift in Sources */,
F88C246E295C37B80006098B /* MainView.swift in Sources */,
F86B721E296C458700EE59EC /* BlurredImage.swift in Sources */,
@ -547,6 +573,7 @@
F89A46DE296EABA20062125F /* StatusPlaceholder.swift in Sources */,
F88C2482295C3A4F0006098B /* StatusView.swift in Sources */,
F866F6A329604161002E8F88 /* AccountDataHandler.swift in Sources */,
F8996DEB2971D29D0043EEC6 /* View+Transition.swift in Sources */,
F89D6C4629718193001DA3D4 /* ThemeSection.swift in Sources */,
F85D497F296416C800751DF7 /* CommentsSection.swift in Sources */,
F88C2486295C48030006098B /* HTMLFotmattedText.swift in Sources */,
@ -564,6 +591,7 @@
F88FAD25295F3FF7009B20C9 /* FederatedFeedView.swift in Sources */,
F88FAD32295F5029009B20C9 /* RemoteFileService.swift in Sources */,
F88FAD27295F400E009B20C9 /* NotificationsView.swift in Sources */,
F89D6C4C297197FE001DA3D4 /* ImageViewerViewModel.swift in Sources */,
F86B7216296BFFDA00EE59EC /* UserProfileStatuses.swift in Sources */,
F897978F29684BCB00B22335 /* LoadingView.swift in Sources */,
F89992C9296D6DC7005994BF /* CommentBody.swift in Sources */,

17
Vernissage/Extensions/View+Transition.swift Normal file
View File

@ -0,0 +1,17 @@
//
// https://mczachurski.dev
// Copyright © 2023 Marcin Czachurski and the repository contributors.
// Licensed under the MIT License.
//
import SwiftUI
extension View {
func withoutAnimation(action: @escaping () -> Void) {
var transaction = Transaction()
transaction.disablesAnimations = true
withTransaction(transaction) {
action()
}
}
}

12
Vernissage/ViewModels/ImageViewerViewModel.swift Normal file
View File

@ -0,0 +1,12 @@
//
// https://mczachurski.dev
// Copyright © 2023 Marcin Czachurski and the repository contributors.
// Licensed under the MIT License.
//
import Foundation
public struct ImageViewerViewModel {
// public var images: []
}

19
Vernissage/Views/StatusView.swift
View File

@ -17,6 +17,7 @@ struct StatusView: View {
@State private var messageForStatus: StatusViewModel?
@State private var showCompose = false
@State private var showImageViewer = false
@State private var firstLoadFinished = false
@State private var statusViewModel: StatusViewModel?
@ -25,7 +26,7 @@ struct StatusView: View {
@State private var exifExposure: String?
@State private var exifCreatedDate: String?
@State private var exifLens: String?
var body: some View {
ScrollView {
if let statusViewModel = self.statusViewModel {
@ -35,6 +36,11 @@ struct StatusView: View {
exifExposure: $exifExposure,
exifCreatedDate: $exifCreatedDate,
exifLens: $exifLens)
.onTapGesture {
withoutAnimation {
self.showImageViewer.toggle()
}
}
VStack(alignment: .leading) {
NavigationLink(destination: UserProfileView(
@ -96,6 +102,17 @@ struct StatusView: View {
.sheet(isPresented: $showCompose, content: {
ComposeView(statusViewModel: $messageForStatus)
})
.fullScreenCover(isPresented: $showImageViewer, content: {
if let statusViewModel = self.statusViewModel {
ImagesViewer(statusViewModel: statusViewModel)
// ImagesViewer(statusViewModel: statusViewModel, imgViewModel: imgViewModel)
}
})
// .overlay(content: {
// if self.showImageViewer, let statusViewModel = self.statusViewModel {
// ImagesViewer(showImageViewer: $showImageViewer, statusViewModel: statusViewModel)
// }
// })
.task {
do {
guard firstLoadFinished == false else {

2
Vernissage/Widgets/BottomRight.swift
View File

@ -14,7 +14,7 @@ struct BottomRight<Content: View>: View {
}
var body: some View {
VStack(alignment:.trailing) {
VStack(alignment: .trailing) {
Spacer()
HStack {
Spacer()

12
Vernissage/Widgets/ImageRow.swift
View File

@ -7,11 +7,9 @@
import SwiftUI
struct ImageRow: View {
@State public var status: StatusData
@State private var imageHeight: Double
@State private var imageWidth: Double
private let status: StatusData
private let imageHeight: Double
private let imageWidth: Double
private let uiImage:UIImage?
private let attachmentData: AttachmentData?
@ -27,7 +25,7 @@ struct ImageRow: View {
let divider = imgWidth / UIScreen.main.bounds.size.width
let calculatedHeight = imgHeight / divider
self.imageWidth = imgWidth
self.imageWidth = UIScreen.main.bounds.width
self.imageHeight = (calculatedHeight > 0 && calculatedHeight < .infinity) ? calculatedHeight : UIScreen.main.bounds.width
} else {
self.uiImage = nil
@ -51,7 +49,7 @@ struct ImageRow: View {
.resizable()
.aspectRatio(contentMode: .fit)
}
if let count = self.status.attachments().count, count > 1 {
BottomRight {
Text("1 / \(count)")

1
Vernissage/Widgets/ImagesCarousel.swift
View File

@ -64,6 +64,5 @@ struct ImagesCarousel: View {
struct ImagesCarousel_Previews: PreviewProvider {
static var previews: some View {
ImagesCarousel(attachments: [], exifCamera: .constant(""), exifExposure: .constant(""), exifCreatedDate: .constant(""), exifLens: .constant(""))
// ImagesCarousel(attachments: [])
}
}

121
Vernissage/Widgets/ImagesViewer.swift Normal file
View File

@ -0,0 +1,121 @@
//
// https://mczachurski.dev
// Copyright © 2023 Marcin Czachurski and the repository contributors.
// Licensed under the MIT License.
//
import SwiftUI
struct ImagesViewer: View {
@State var statusViewModel: StatusViewModel
@State var visible = false
@Environment(\.dismiss) private var dismiss
// Zoom.
@State var zoomScale = 1.0
// Magnification.
@State private var currentAmount = 0.0
@State private var finalAmount = 1.0
// Draging.
@State private var currentOffset = CGSize.zero
var body: some View {
ZStack {
if self.visible {
TabView() {
ForEach(statusViewModel.mediaAttachments, id: \.id) { attachment in
if let data = attachment.data, let image = UIImage(data: data) {
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fit)
.tag(attachment.id)
.offset(currentOffset)
.scaleEffect((finalAmount + currentAmount) < 1.0 ? 1.0 : (finalAmount + currentAmount))
.gesture((finalAmount + currentAmount) > 1.0 ? dragGesture : nil)
.gesture(magnificationGesture)
.gesture(doubleTapGesture)
.gesture(tapGesture)
}
}
}
.tabViewStyle(PageTabViewStyle())
.overlay(alignment: .topTrailing, content: {
Button {
self.close()
} label: {
Image(systemName: "xmark")
.foregroundColor(.white)
.padding(8)
.background(Color.white.opacity(0.25))
.clipShape(Circle())
}
})
}
}
.onAppear {
withAnimation(.easeInOut) {
self.visible = true
}
}
}
private func close() {
withAnimation(.easeInOut) {
self.visible = false
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.36) {
withoutAnimation {
dismiss()
}
}
}
var magnificationGesture: some Gesture {
MagnificationGesture()
.onChanged { amount in
currentAmount = amount - 1
}
.onEnded { amount in
finalAmount += currentAmount
currentAmount = 0
}
}
var doubleTapGesture: some Gesture {
TapGesture(count: 2)
.onEnded { _ in
currentOffset = CGSize.zero
currentAmount = 0
finalAmount = 1.0
}
}
var dragGesture: some Gesture {
DragGesture()
.onChanged { amount in
self.currentOffset = amount.translation
} .onEnded { amount in
if (finalAmount + currentAmount) == 1.0 {
withAnimation(.linear) {
currentOffset = CGSize.zero
}
}
}
}
var tapGesture: some Gesture {
TapGesture().onEnded({ _ in
self.close()
})
}
}
struct ImagesViewer_Previews: PreviewProvider {
static var previews: some View {
Text("Cos")
// ImagesViewer(statusViewModel: StatusViewModel())
}
}

0
Vernissage/Widgets/CommentBody.swift → Vernissage/Widgets/StatusView/CommentBody.swift
View File

0
Vernissage/Widgets/CommentsSection.swift → Vernissage/Widgets/StatusView/CommentsSection.swift
View File

0
Vernissage/Widgets/StatusPlaceholder.swift → Vernissage/Widgets/StatusView/StatusPlaceholder.swift
View File

0
Vernissage/Widgets/UserProfileHeader.swift → Vernissage/Widgets/UserProfile/UserProfileHeader.swift
View File

0
Vernissage/Widgets/UserProfileStatuses.swift → Vernissage/Widgets/UserProfile/UserProfileStatuses.swift
View File