diff options
| author | Fuwn <[email protected]> | 2025-02-22 00:14:29 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2025-02-22 00:14:29 -0800 |
| commit | ab410956419067fd1e751f82a8f4e25bd1d6d091 (patch) | |
| tree | a77bb1b10b6eaabd8b61c8144df7b68d2094dc08 /Sora/Views | |
| parent | feat: Development commit (diff) | |
| download | sora-testing-ab410956419067fd1e751f82a8f4e25bd1d6d091.tar.xz sora-testing-ab410956419067fd1e751f82a8f4e25bd1d6d091.zip | |
feat: Development commit
Diffstat (limited to 'Sora/Views')
| -rw-r--r-- | Sora/Views/Post/PostDetailsView.swift | 6 | ||||
| -rw-r--r-- | Sora/Views/Post/PostGridBookmarkButtonView.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Post/PostGridView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/PostView.swift | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/Sora/Views/Post/PostDetailsView.swift b/Sora/Views/Post/PostDetailsView.swift index 133fa34..f61b82a 100644 --- a/Sora/Views/Post/PostDetailsView.swift +++ b/Sora/Views/Post/PostDetailsView.swift @@ -3,13 +3,15 @@ import SwiftUI struct PostDetailsView: View { @EnvironmentObject var settings: Settings let post: BooruPost - @State var loadingStage: PostLoadingState = .loadingPreview + @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 } @@ -51,8 +53,10 @@ struct PostDetailsView: View { switch loadingStage { case .loadingPreview: Text("Loading preview …") + case .loadingFile: Text("Loading \(settings.detailViewType.rawValue) …") + case .loaded: EmptyView() } diff --git a/Sora/Views/Post/PostGridBookmarkButtonView.swift b/Sora/Views/Post/PostGridBookmarkButtonView.swift index f23482f..a25b24f 100644 --- a/Sora/Views/Post/PostGridBookmarkButtonView.swift +++ b/Sora/Views/Post/PostGridBookmarkButtonView.swift @@ -6,10 +6,10 @@ struct PostGridBookmarkButtonView: View { var contained: Bool { settings.bookmarks - .contains(where: { + .contains { $0.tags == manager.tags.map { $0.lowercased() } && $0.provider == manager.provider ?? settings.preferredBooru - }) + } } var body: some View { diff --git a/Sora/Views/Post/PostGridView.swift b/Sora/Views/Post/PostGridView.swift index 842d0a6..ab2340f 100644 --- a/Sora/Views/Post/PostGridView.swift +++ b/Sora/Views/Post/PostGridView.swift @@ -9,7 +9,7 @@ struct PostGridView: View { var filteredPosts: [BooruPost] { (settings.showNSFWPosts ? manager.posts : manager.posts.filter { $0.rating == "s" || $0.rating == "q" }) - .sorted(by: { $0.id > $1.id }) + .sorted { $0.id > $1.id } } var body: some View { diff --git a/Sora/Views/Post/PostView.swift b/Sora/Views/Post/PostView.swift index 9b92f4f..6b54a85 100644 --- a/Sora/Views/Post/PostView.swift +++ b/Sora/Views/Post/PostView.swift @@ -9,8 +9,10 @@ struct PostView: View { switch settings.thumbnailType { case .preview: post.previewURL + case .sample: post.sampleURL + case .original: post.fileURL } |