From cafece91bae45194d64f4932bb04be018b82d21b Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 22 Feb 2025 07:07:57 -0800 Subject: feat: Development commit --- Sora/Views/Post/Details/PostDetailsImageView.swift | 106 +++++++++++++++++++++ Sora/Views/Post/Details/PostDetailsView.swift | 87 +++++++++++++++++ .../Post/Grid/PostGridBookmarkButtonView.swift | 37 +++++++ Sora/Views/Post/Grid/PostGridThumbnailView.swift | 47 +++++++++ Sora/Views/Post/Grid/PostGridView.swift | 101 ++++++++++++++++++++ Sora/Views/Post/PostDetailsView.swift | 87 ----------------- Sora/Views/Post/PostGridBookmarkButtonView.swift | 37 ------- Sora/Views/Post/PostGridView.swift | 101 -------------------- Sora/Views/Post/PostView.swift | 47 --------- 9 files changed, 378 insertions(+), 272 deletions(-) create mode 100644 Sora/Views/Post/Details/PostDetailsImageView.swift create mode 100644 Sora/Views/Post/Details/PostDetailsView.swift create mode 100644 Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift create mode 100644 Sora/Views/Post/Grid/PostGridThumbnailView.swift create mode 100644 Sora/Views/Post/Grid/PostGridView.swift delete mode 100644 Sora/Views/Post/PostDetailsView.swift delete mode 100644 Sora/Views/Post/PostGridBookmarkButtonView.swift delete mode 100644 Sora/Views/Post/PostGridView.swift delete mode 100644 Sora/Views/Post/PostView.swift (limited to 'Sora/Views/Post') 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: 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, + 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/Details/PostDetailsView.swift b/Sora/Views/Post/Details/PostDetailsView.swift new file mode 100644 index 0000000..3c004ca --- /dev/null +++ b/Sora/Views/Post/Details/PostDetailsView.swift @@ -0,0 +1,87 @@ +import SwiftUI + +struct PostDetailsView: View { + @EnvironmentObject var settings: Settings + let post: BooruPost + @State private var loadingStage: BooruPostLoadingState = .loadingPreview + private var imageURL: URL? { + switch settings.detailViewType { + case .preview: + post.previewURL + + case .sample: + post.sampleURL + + case .original: + post.fileURL + } + } + + var body: some View { + VStack(spacing: 0) { + PostDetailsImageView( + url: imageURL, + loadingStage: $loadingStage, + finalLoadingState: .loaded, + postURL: URL(string: "https://yande.re/post/show/\(post.id)")! + ) { + PostDetailsImageView( + url: post.previewURL, + loadingStage: $loadingStage + ) + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) + .id(post.previewURL) + } + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) + .id(imageURL) + .padding(0) + .zIndex(0) + + VStack(spacing: 5) { + HStack { + Text(post.tags.joined(separator: ", ")) + } + .frame(maxWidth: .infinity, alignment: .leading) + + HStack { + Text( + post.createdAt.formatted() + ) + .frame(maxWidth: .infinity, alignment: .leading) + + Group { + switch loadingStage { + case .loadingPreview: + Text("Loading preview …") + + case .loadingFile: + Text("Loading \(settings.detailViewType.rawValue) …") + + case .loaded: + EmptyView() + } + } + .padding(.trailing, 5) + } + .frame(maxWidth: .infinity, alignment: .leading) + .foregroundStyle(.secondary) + } + .padding(.horizontal, 10) + .padding(.vertical, 10 / 1.33) + .textSelection(.enabled) + .font(.footnote) + #if os(iOS) + .background(.ultraThinMaterial) + #else + .background(.opacity(0.1)) + #endif + .zIndex(1) + } + .navigationTitle("Details") + #if os(iOS) + .navigationBarTitleDisplayMode(.inline) + .toolbarBackground(.visible, for: .navigationBar) + .toolbarBackground(.ultraThinMaterial, for: .navigationBar) + #endif + } +} diff --git a/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift new file mode 100644 index 0000000..9f85a20 --- /dev/null +++ b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift @@ -0,0 +1,37 @@ +import SwiftUI + +struct PostGridBookmarkButtonView: View { + @EnvironmentObject private var manager: BooruManager + @EnvironmentObject private var settings: Settings + + var contained: Bool { + let lowercaseTags = manager.tags.map { $0.lowercased() } + + return settings.bookmarks + .contains { bookmark in + bookmark.tags == lowercaseTags + && bookmark.provider == manager.provider ?? settings.preferredBooru + } + } + + var body: some View { + Button( + action: { + contained + ? settings + .removeBookmark(withTags: manager.tags) + : settings + .addBookmark( + provider: manager.provider ?? settings.preferredBooru, + tags: manager.tags + ) + } + ) { + Label( + "Bookmark", + systemImage: + contained ? "bookmark.fill" : "bookmark" + ) + } + } +} diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift new file mode 100644 index 0000000..e90b39b --- /dev/null +++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift @@ -0,0 +1,47 @@ +import SwiftUI + +struct PostGridThumbnailView: View { + @EnvironmentObject var settings: Settings + @EnvironmentObject var manager: BooruManager + let post: BooruPost + let posts: [BooruPost] + private var thumbnailURL: URL? { + switch settings.thumbnailType { + case .preview: + post.previewURL + + case .sample: + post.sampleURL + + case .original: + post.fileURL + } + } + + var body: some View { + VStack { + AsyncImage(url: thumbnailURL) { image in + image + .resizable() + .aspectRatio(contentMode: .fit) + .onScrollVisibilityChange { visible in + if post == posts.last, !manager.endOfData, visible { + Task { + manager.loadNextPage() + } + } + } + .blur( + radius: settings.blurNSFWThumbnails + ? (post.rating != "s" && post.rating != "q") ? 10 : 0 : 0 + ) + .clipped() + .animation(.default, value: settings.blurNSFWThumbnails) + .clipShape(RoundedRectangle(cornerRadius: 8)) + } placeholder: { + ProgressView() + .padding() + } + } + } +} diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift new file mode 100644 index 0000000..9738a15 --- /dev/null +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -0,0 +1,101 @@ +import SwiftUI +import WaterfallGrid + +struct PostGridView: View { + @EnvironmentObject var settings: Settings + @EnvironmentObject var manager: BooruManager + + @Environment(\.isSearching) + private var isSearching + + var filteredPosts: [BooruPost] { + (settings.showNSFWPosts + ? manager.posts : manager.posts.filter { $0.rating == "s" || $0.rating == "q" }) + .sorted { $0.id > $1.id } + } + + var body: some View { + ScrollViewReader { _ in + ScrollView { + if filteredPosts.isEmpty { + ProgressView() + .padding() + } + + WaterfallGrid(filteredPosts, id: \.id) { post in + Group { + #if os(macOS) + Button { + manager.selectedPost = post + } label: { + PostGridThumbnailView( + post: post, + posts: filteredPosts + ) + } + .buttonStyle(PlainButtonStyle()) + #else + NavigationLink(value: post) { + PostGridThumbnailView( + post: post, + posts: filteredPosts + ) + } + #endif + } + } + .gridStyle(columns: settings.columns) + .padding(8) + } + .searchable(text: $manager.searchText, prompt: "Tags") + .searchSuggestions { + if settings.searchSuggestions { + SearchSuggestionsView( + tags: manager.allTags, + searchText: $manager.searchText + ) + } + } + .onSubmit(of: .search, manager.performSearch) + .navigationDestination(for: BooruPost.self) { post in + PostDetailsView(post: post) + } + .onChange(of: manager.searchText) { _, _ in + if manager.searchText.isEmpty, !isSearching { + Task { + manager.performSearch() + } + } + } + .toolbar { + #if os(macOS) + ToolbarItem { + Button(action: { + Task { + await manager.fetchPosts(page: 1, tags: manager.tags, replace: true) + } + }) { + Label("Refresh", systemImage: "arrow.clockwise") + } + } + #endif + + if !manager.tags.isEmpty { + #if os(macOS) + ToolbarItem { + PostGridBookmarkButtonView() + } + #else + ToolbarItem(placement: .bottomBar) { + PostGridBookmarkButtonView() + } + #endif + } + } + .navigationTitle("Posts") + .refreshable { + await manager.fetchPosts(page: 1, tags: manager.tags, replace: true) + } + } + } +} diff --git a/Sora/Views/Post/PostDetailsView.swift b/Sora/Views/Post/PostDetailsView.swift deleted file mode 100644 index f61b82a..0000000 --- a/Sora/Views/Post/PostDetailsView.swift +++ /dev/null @@ -1,87 +0,0 @@ -import SwiftUI - -struct PostDetailsView: View { - @EnvironmentObject var settings: Settings - let post: BooruPost - @State private var loadingStage: PostLoadingState = .loadingPreview - private var imageURL: URL? { - switch settings.detailViewType { - case .preview: - post.previewURL - - case .sample: - post.sampleURL - - case .original: - post.fileURL - } - } - - var body: some View { - VStack(spacing: 0) { - AsyncImageWithPreview( - url: imageURL, - loadingStage: $loadingStage, - finalLoadingState: .loaded, - postURL: URL(string: "https://yande.re/post/show/\(post.id)")! - ) { - AsyncImageWithPreview( - url: post.previewURL, - loadingStage: $loadingStage - ) - .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) - .id(post.previewURL) - } - .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) - .id(imageURL) - .padding(0) - .zIndex(0) - - VStack(spacing: 5) { - HStack { - Text(post.tags.joined(separator: ", ")) - } - .frame(maxWidth: .infinity, alignment: .leading) - - HStack { - Text( - post.createdAt.formatted() - ) - .frame(maxWidth: .infinity, alignment: .leading) - - Group { - switch loadingStage { - case .loadingPreview: - Text("Loading preview …") - - case .loadingFile: - Text("Loading \(settings.detailViewType.rawValue) …") - - case .loaded: - EmptyView() - } - } - .padding(.trailing, 5) - } - .frame(maxWidth: .infinity, alignment: .leading) - .foregroundStyle(.secondary) - } - .padding(.horizontal, 10) - .padding(.vertical, 10 / 1.33) - .textSelection(.enabled) - .font(.footnote) - #if os(iOS) - .background(.ultraThinMaterial) - #else - .background(.opacity(0.1)) - #endif - .zIndex(1) - } - .navigationTitle("Details") - #if os(iOS) - .navigationBarTitleDisplayMode(.inline) - .toolbarBackground(.visible, for: .navigationBar) - .toolbarBackground(.ultraThinMaterial, for: .navigationBar) - #endif - } -} diff --git a/Sora/Views/Post/PostGridBookmarkButtonView.swift b/Sora/Views/Post/PostGridBookmarkButtonView.swift deleted file mode 100644 index 9f85a20..0000000 --- a/Sora/Views/Post/PostGridBookmarkButtonView.swift +++ /dev/null @@ -1,37 +0,0 @@ -import SwiftUI - -struct PostGridBookmarkButtonView: View { - @EnvironmentObject private var manager: BooruManager - @EnvironmentObject private var settings: Settings - - var contained: Bool { - let lowercaseTags = manager.tags.map { $0.lowercased() } - - return settings.bookmarks - .contains { bookmark in - bookmark.tags == lowercaseTags - && bookmark.provider == manager.provider ?? settings.preferredBooru - } - } - - var body: some View { - Button( - action: { - contained - ? settings - .removeBookmark(withTags: manager.tags) - : settings - .addBookmark( - provider: manager.provider ?? settings.preferredBooru, - tags: manager.tags - ) - } - ) { - Label( - "Bookmark", - systemImage: - contained ? "bookmark.fill" : "bookmark" - ) - } - } -} diff --git a/Sora/Views/Post/PostGridView.swift b/Sora/Views/Post/PostGridView.swift deleted file mode 100644 index fb813af..0000000 --- a/Sora/Views/Post/PostGridView.swift +++ /dev/null @@ -1,101 +0,0 @@ -import SwiftUI -import WaterfallGrid - -struct PostGridView: View { - @EnvironmentObject var settings: Settings - @EnvironmentObject var manager: BooruManager - - @Environment(\.isSearching) - private var isSearching - - var filteredPosts: [BooruPost] { - (settings.showNSFWPosts - ? manager.posts : manager.posts.filter { $0.rating == "s" || $0.rating == "q" }) - .sorted { $0.id > $1.id } - } - - var body: some View { - ScrollViewReader { _ in - ScrollView { - if filteredPosts.isEmpty { - ProgressView() - .padding() - } - - WaterfallGrid(filteredPosts, id: \.id) { post in - Group { - #if os(macOS) - Button { - manager.selectedPost = post - } label: { - PostView( - post: post, - posts: filteredPosts - ) - } - .buttonStyle(PlainButtonStyle()) - #else - NavigationLink(value: post) { - PostView( - post: post, - posts: filteredPosts - ) - } - #endif - } - } - .gridStyle(columns: settings.columns) - .padding(8) - } - .searchable(text: $manager.searchText, prompt: "Tags") - .searchSuggestions { - if settings.searchSuggestions { - SearchSuggestionsView( - tags: manager.allTags, - searchText: $manager.searchText - ) - } - } - .onSubmit(of: .search, manager.performSearch) - .navigationDestination(for: BooruPost.self) { post in - PostDetailsView(post: post) - } - .onChange(of: manager.searchText) { _, _ in - if manager.searchText.isEmpty, !isSearching { - Task { - manager.performSearch() - } - } - } - .toolbar { - #if os(macOS) - ToolbarItem { - Button(action: { - Task { - await manager.fetchPosts(page: 1, tags: manager.tags, replace: true) - } - }) { - Label("Refresh", systemImage: "arrow.clockwise") - } - } - #endif - - if !manager.tags.isEmpty { - #if os(macOS) - ToolbarItem { - PostGridBookmarkButtonView() - } - #else - ToolbarItem(placement: .bottomBar) { - PostGridBookmarkButtonView() - } - #endif - } - } - .navigationTitle("Posts") - .refreshable { - await manager.fetchPosts(page: 1, tags: manager.tags, replace: true) - } - } - } -} diff --git a/Sora/Views/Post/PostView.swift b/Sora/Views/Post/PostView.swift deleted file mode 100644 index c2cafb2..0000000 --- a/Sora/Views/Post/PostView.swift +++ /dev/null @@ -1,47 +0,0 @@ -import SwiftUI - -struct PostView: View { - @EnvironmentObject var settings: Settings - @EnvironmentObject var manager: BooruManager - let post: BooruPost - let posts: [BooruPost] - private var thumbnailURL: URL? { - switch settings.thumbnailType { - case .preview: - post.previewURL - - case .sample: - post.sampleURL - - case .original: - post.fileURL - } - } - - var body: some View { - VStack { - AsyncImage(url: thumbnailURL) { image in - image - .resizable() - .aspectRatio(contentMode: .fit) - .onScrollVisibilityChange { visible in - if post == posts.last, !manager.endOfData, visible { - Task { - manager.loadNextPage() - } - } - } - .blur( - radius: settings.blurNSFWThumbnails - ? (post.rating != "s" && post.rating != "q") ? 10 : 0 : 0 - ) - .clipped() - .animation(.default, value: settings.blurNSFWThumbnails) - .clipShape(RoundedRectangle(cornerRadius: 8)) - } placeholder: { - ProgressView() - .padding() - } - } - } -} -- cgit v1.2.3