diff options
Diffstat (limited to 'Sora/Views/Post')
| -rw-r--r-- | Sora/Views/Post/Details/PostDetailsImageView.swift | 106 | ||||
| -rw-r--r-- | Sora/Views/Post/Details/PostDetailsView.swift (renamed from Sora/Views/Post/PostDetailsView.swift) | 6 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift (renamed from Sora/Views/Post/PostGridBookmarkButtonView.swift) | 0 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridThumbnailView.swift (renamed from Sora/Views/Post/PostView.swift) | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridView.swift (renamed from Sora/Views/Post/PostGridView.swift) | 4 |
5 files changed, 112 insertions, 6 deletions
diff --git a/Sora/Views/Post/Details/PostDetailsImageView.swift b/Sora/Views/Post/Details/PostDetailsImageView.swift new file mode 100644 index 0000000..d6307d5 --- /dev/null +++ b/Sora/Views/Post/Details/PostDetailsImageView.swift @@ -0,0 +1,106 @@ +import SwiftUI + +struct PostDetailsImageView<Placeholder: View>: View { + @EnvironmentObject var settings: Settings + var url: URL? + @Binding var loadingState: BooruPostLoadingState + var finalLoadingState: BooruPostLoadingState + var postURL: URL? + let placeholder: () -> Placeholder + @State private var currentScale: CGFloat = 1.0 + @State private var finalScale: CGFloat = 1.0 + @State private var currentOffset: CGSize = .zero + @State private var finalOffset: CGSize = .zero + + #if os(iOS) + var keyWindow: UIWindow? { + guard + let window = UIApplication.shared.connectedScenes + .compactMap({ $0 as? UIWindowScene }) + .flatMap(\.windows) + .first(where: \.isKeyWindow) + else { + return nil + } + + return window + } + #endif + + var body: some View { + AsyncImage(url: url) { image in + InteractiveImageView(image: image) + .onAppear { + loadingState = finalLoadingState + } + .contextMenu { + #if os(iOS) + Button { + guard let url else { return } + + URLSession.shared.dataTask(with: url) { data, _, _ in + guard let data, let uiImage = UIImage(data: data) else { return } + + UIImageWriteToSavedPhotosAlbum(uiImage, nil, nil, nil) + } + .resume() + } label: { + Label("Save Image", systemImage: "square.and.arrow.down") + } + #endif + + #if os(iOS) + if settings.enableShareShortcut { + Button { + keyWindow?.rootViewController?.present( + UIActivityViewController( + activityItems: [url ?? URL(string: "")!], applicationActivities: nil + ), animated: true + ) + } label: { + Label("Share Image", systemImage: "square.and.arrow.up") + } + } + #endif + + if let url = postURL { + Button { + #if os(iOS) + UIApplication.shared.open(url) + #else + NSWorkspace.shared.open(url) + #endif + } label: { + Label("Open in Safari", systemImage: "safari") + } + } + } + } placeholder: { + placeholder() + .onAppear { + loadingState = .loadingPreview + } + } + } + + init( + url: URL?, + loadingStage: Binding<BooruPostLoadingState>, + finalLoadingState: BooruPostLoadingState = .loadingFile, + postURL: URL? = nil, + @ViewBuilder placeholder: @escaping () -> Placeholder = { + GeometryReader { geometry in + ProgressView() + .frame(width: geometry.size.width, height: geometry.size.height) + .position(x: geometry.size.width / 2, y: geometry.size.height / 2) + .padding() + } + } + ) { + self.url = url + _loadingState = loadingStage + self.finalLoadingState = finalLoadingState + self.postURL = postURL + self.placeholder = placeholder + } +} diff --git a/Sora/Views/Post/PostDetailsView.swift b/Sora/Views/Post/Details/PostDetailsView.swift index f61b82a..3c004ca 100644 --- a/Sora/Views/Post/PostDetailsView.swift +++ b/Sora/Views/Post/Details/PostDetailsView.swift @@ -3,7 +3,7 @@ import SwiftUI struct PostDetailsView: View { @EnvironmentObject var settings: Settings let post: BooruPost - @State private var loadingStage: PostLoadingState = .loadingPreview + @State private var loadingStage: BooruPostLoadingState = .loadingPreview private var imageURL: URL? { switch settings.detailViewType { case .preview: @@ -19,13 +19,13 @@ struct PostDetailsView: View { var body: some View { VStack(spacing: 0) { - AsyncImageWithPreview( + PostDetailsImageView( url: imageURL, loadingStage: $loadingStage, finalLoadingState: .loaded, postURL: URL(string: "https://yande.re/post/show/\(post.id)")! ) { - AsyncImageWithPreview( + PostDetailsImageView( url: post.previewURL, loadingStage: $loadingStage ) diff --git a/Sora/Views/Post/PostGridBookmarkButtonView.swift b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift index 9f85a20..9f85a20 100644 --- a/Sora/Views/Post/PostGridBookmarkButtonView.swift +++ b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift diff --git a/Sora/Views/Post/PostView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift index c2cafb2..e90b39b 100644 --- a/Sora/Views/Post/PostView.swift +++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift @@ -1,6 +1,6 @@ import SwiftUI -struct PostView: View { +struct PostGridThumbnailView: View { @EnvironmentObject var settings: Settings @EnvironmentObject var manager: BooruManager let post: BooruPost diff --git a/Sora/Views/Post/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift index fb813af..9738a15 100644 --- a/Sora/Views/Post/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -28,7 +28,7 @@ struct PostGridView: View { Button { manager.selectedPost = post } label: { - PostView( + PostGridThumbnailView( post: post, posts: filteredPosts ) @@ -36,7 +36,7 @@ struct PostGridView: View { .buttonStyle(PlainButtonStyle()) #else NavigationLink(value: post) { - PostView( + PostGridThumbnailView( post: post, posts: filteredPosts ) |