summaryrefslogtreecommitdiff
path: root/Sora/Views
diff options
context:
space:
mode:
Diffstat (limited to 'Sora/Views')
-rw-r--r--Sora/Views/Bookmarks/BookmarksView.swift2
-rw-r--r--Sora/Views/MainView.swift6
-rw-r--r--Sora/Views/Post/PostDetailsView.swift6
-rw-r--r--Sora/Views/Post/PostGridView.swift2
-rw-r--r--Sora/Views/Post/PostView.swift8
-rw-r--r--Sora/Views/SettingsView.swift2
6 files changed, 13 insertions, 13 deletions
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()
}
}