diff options
| author | Fuwn <[email protected]> | 2025-02-21 23:30:01 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2025-02-21 23:30:01 -0800 |
| commit | c82c394a2fa8513a83238fb4d0ccdd8567b316d5 (patch) | |
| tree | 7d392440848a48b5d77edb027f248d8a1e1fa153 | |
| parent | feat: Development commit (diff) | |
| download | sora-testing-c82c394a2fa8513a83238fb4d0ccdd8567b316d5.tar.xz sora-testing-c82c394a2fa8513a83238fb4d0ccdd8567b316d5.zip | |
feat: Development commit
| -rw-r--r-- | Sora/Data/Booru/BooruManager.swift | 6 | ||||
| -rw-r--r-- | Sora/Data/Booru/BooruProvider.swift | 4 | ||||
| -rw-r--r-- | Sora/Other/AsyncImageWithPreview.swift | 8 | ||||
| -rw-r--r-- | Sora/Views/Bookmarks/BookmarksView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/MainView.swift | 6 | ||||
| -rw-r--r-- | Sora/Views/Post/PostDetailsView.swift | 6 | ||||
| -rw-r--r-- | Sora/Views/Post/PostGridView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/PostView.swift | 8 | ||||
| -rw-r--r-- | Sora/Views/SettingsView.swift | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift index 3c5f49b..dd63367 100644 --- a/Sora/Data/Booru/BooruManager.swift +++ b/Sora/Data/Booru/BooruManager.swift @@ -134,11 +134,11 @@ class BooruManager: ObservableObject { private func urlForTags(limit: Int) -> URL? { switch provider { case .yandere: - return URL(string: "https://yande.re/tag.xml?limit=\(limit)") + URL(string: "https://yande.re/tag.xml?limit=\(limit)") case .safebooru: - return URL(string: "https://safebooru.org/index.php?page=dapi&s=tag&q=index&limit=\(limit)") + URL(string: "https://safebooru.org/index.php?page=dapi&s=tag&q=index&limit=\(limit)") default: - return nil + nil } } } diff --git a/Sora/Data/Booru/BooruProvider.swift b/Sora/Data/Booru/BooruProvider.swift index 3b3b126..73bb4f2 100644 --- a/Sora/Data/Booru/BooruProvider.swift +++ b/Sora/Data/Booru/BooruProvider.swift @@ -5,9 +5,9 @@ enum BooruProvider: String, CaseIterable, Decodable, Encodable { func formatted() -> String { switch self { case .yandere: - return "yande.re" + "yande.re" case .safebooru: - return "Safebooru" + "Safebooru" } } } diff --git a/Sora/Other/AsyncImageWithPreview.swift b/Sora/Other/AsyncImageWithPreview.swift index 8d93ee5..43b31c4 100644 --- a/Sora/Other/AsyncImageWithPreview.swift +++ b/Sora/Other/AsyncImageWithPreview.swift @@ -39,7 +39,7 @@ struct AsyncImageWithPreview<Placeholder: View>: View { .resizable() .scaledToFit() .onAppear { - self.loadingState = finalLoadingState + loadingState = finalLoadingState } .scaleEffect(finalScale * currentScale) .offset(x: finalOffset.width + currentOffset.width, @@ -118,10 +118,10 @@ struct AsyncImageWithPreview<Placeholder: View>: View { .contextMenu { #if os(iOS) Button { - guard let url = url else { return } + guard let url else { return } URLSession.shared.dataTask(with: url) { data, _, _ in - guard let data = data, let uiImage = UIImage(data: data) else { return } + guard let data, let uiImage = UIImage(data: data) else { return } UIImageWriteToSavedPhotosAlbum(uiImage, nil, nil, nil) }.resume() @@ -155,7 +155,7 @@ struct AsyncImageWithPreview<Placeholder: View>: View { } placeholder: { placeholder() .onAppear { - self.loadingState = .loadingPreview + loadingState = .loadingPreview } } } diff --git a/Sora/Views/Bookmarks/BookmarksView.swift b/Sora/Views/Bookmarks/BookmarksView.swift index 9a0ef75..83eda0e 100644 --- a/Sora/Views/Bookmarks/BookmarksView.swift +++ b/Sora/Views/Bookmarks/BookmarksView.swift @@ -24,7 +24,7 @@ struct BookmarksView: View { description: Text("Add a bookmark by tapping the bookmark button on a search page.")) } else { List { - if filteredBookmarks.isEmpty && !bookmarksSearchText.isEmpty { + if filteredBookmarks.isEmpty, !bookmarksSearchText.isEmpty { Text("No bookmarks match your search") } diff --git a/Sora/Views/MainView.swift b/Sora/Views/MainView.swift index b8da4da..82367c7 100644 --- a/Sora/Views/MainView.swift +++ b/Sora/Views/MainView.swift @@ -47,10 +47,10 @@ struct MainView: View { manager.searchText = previousSearchText Task { - if self.manager.searchText.isEmpty { - await self.manager.fetchPosts() + if manager.searchText.isEmpty { + await manager.fetchPosts() } else { - self.manager.performSearch() + manager.performSearch() } } } diff --git a/Sora/Views/Post/PostDetailsView.swift b/Sora/Views/Post/PostDetailsView.swift index b24b70b..0e2566d 100644 --- a/Sora/Views/Post/PostDetailsView.swift +++ b/Sora/Views/Post/PostDetailsView.swift @@ -7,11 +7,11 @@ struct PostDetailsView: View { private var imageURL: URL? { switch settings.detailViewType { case .preview: - return post.previewURL + post.previewURL case .sample: - return post.sampleURL + post.sampleURL case .original: - return post.fileURL + post.fileURL } } diff --git a/Sora/Views/Post/PostGridView.swift b/Sora/Views/Post/PostGridView.swift index 3ccc772..89c762a 100644 --- a/Sora/Views/Post/PostGridView.swift +++ b/Sora/Views/Post/PostGridView.swift @@ -59,7 +59,7 @@ struct PostGridView: View { PostDetailsView(post: post) } .onChange(of: manager.searchText) { _, _ in - if manager.searchText.isEmpty && !isSearching { + if manager.searchText.isEmpty, !isSearching { Task { manager.performSearch() } diff --git a/Sora/Views/Post/PostView.swift b/Sora/Views/Post/PostView.swift index 7635641..ce46152 100644 --- a/Sora/Views/Post/PostView.swift +++ b/Sora/Views/Post/PostView.swift @@ -8,11 +8,11 @@ struct PostView: View { private var thumbnailURL: URL? { switch settings.thumbnailType { case .preview: - return post.previewURL + post.previewURL case .sample: - return post.sampleURL + post.sampleURL case .original: - return post.fileURL + post.fileURL } } @@ -23,7 +23,7 @@ struct PostView: View { .resizable() .aspectRatio(contentMode: .fit) .onScrollVisibilityChange { visible in - if post == posts.last && !manager.endOfData && visible { + if post == posts.last, !manager.endOfData, visible { Task { manager.loadNextPage() } diff --git a/Sora/Views/SettingsView.swift b/Sora/Views/SettingsView.swift index 5a42cd1..a4a37ae 100644 --- a/Sora/Views/SettingsView.swift +++ b/Sora/Views/SettingsView.swift @@ -23,7 +23,7 @@ struct SettingsView: View { Section(header: Text("Settings")) { Button("Reset to Defaults") { - self.settings.resetToDefaults() + settings.resetToDefaults() } } |