summaryrefslogtreecommitdiff
path: root/Sora
diff options
context:
space:
mode:
Diffstat (limited to 'Sora')
-rw-r--r--Sora/SoraApp.swift1
-rw-r--r--Sora/Views/Post/Grid/PostGridThumbnailView.swift8
-rw-r--r--Sora/Views/Settings/Section/SettingsSearchView.swift7
-rw-r--r--Sora/Views/Settings/Section/SettingsThumbnailsView.swift17
4 files changed, 25 insertions, 8 deletions
diff --git a/Sora/SoraApp.swift b/Sora/SoraApp.swift
index aa5ac60..12c8a24 100644
--- a/Sora/SoraApp.swift
+++ b/Sora/SoraApp.swift
@@ -14,6 +14,7 @@ struct SoraApp: App {
SwiftUI.Settings {
SettingsView()
.environmentObject(settings)
+ .windowResizeBehavior(.enabled)
}
#endif
}
diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift
index 7587002..b68a437 100644
--- a/Sora/Views/Post/Grid/PostGridThumbnailView.swift
+++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift
@@ -22,6 +22,8 @@ struct PostGridThumbnailView: View {
var body: some View {
VStack {
NetworkImage(url: thumbnailURL, transaction: Transaction(animation: .default)) { image in
+ let isFiltered = settings.blurRatings.contains(post.rating)
+
image
.resizable()
.aspectRatio(contentMode: .fit)
@@ -32,11 +34,9 @@ struct PostGridThumbnailView: View {
}
}
}
- .blur(
- radius: settings.blurRatings.contains(post.rating) ? 10 : 0
- )
+ .blur(radius: isFiltered ? 8 : 0)
.clipped()
- .animation(.default, value: settings.blurNSFWThumbnails)
+ .animation(.default, value: isFiltered)
.clipShape(RoundedRectangle(cornerRadius: 8))
} placeholder: {
ProgressView()
diff --git a/Sora/Views/Settings/Section/SettingsSearchView.swift b/Sora/Views/Settings/Section/SettingsSearchView.swift
index 644b02c..ee4d09c 100644
--- a/Sora/Views/Settings/Section/SettingsSearchView.swift
+++ b/Sora/Views/Settings/Section/SettingsSearchView.swift
@@ -2,7 +2,12 @@ import SwiftUI
struct SettingsSearchView: View {
@EnvironmentObject var settings: Settings
- @EnvironmentObject var manager: BooruManager
+
+ #if os(macOS)
+ var manager = BooruManager(.yandere)
+ #else
+ @EnvironmentObject var manager: BooruManager
+ #endif
var body: some View {
Toggle("Suggest Search Tags", isOn: $settings.searchSuggestions)
diff --git a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
index 0491d04..37871d3 100644
--- a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
+++ b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
@@ -2,6 +2,7 @@ import SwiftUI
struct SettingsThumbnailsView: View {
@EnvironmentObject var settings: Settings
+ @State private var isShowingContentFiltering = false
var body: some View {
Picker("Thumbnail Type", selection: $settings.thumbnailType) {
@@ -22,8 +23,18 @@ struct SettingsThumbnailsView: View {
)
#endif
- NavigationLink(destination: SettingsContentRatingsView()) {
- Text("Content Filtering")
- }
+ #if os(macOS)
+ Button("Content Filtering") {
+ isShowingContentFiltering.toggle()
+ }
+ .sheet(isPresented: $isShowingContentFiltering) {
+ SettingsContentRatingsView()
+ .frame(minHeight: 250)
+ }
+ #else
+ NavigationLink(destination: SettingsContentRatingsView()) {
+ Text("Content Filtering")
+ }
+ #endif
}
}