summaryrefslogtreecommitdiff
path: root/Sora
diff options
context:
space:
mode:
Diffstat (limited to 'Sora')
-rw-r--r--Sora/Data/Settings/Settings.swift20
-rw-r--r--Sora/Views/Post/Details/PostDetailsImageView.swift2
-rw-r--r--Sora/Views/Post/Details/PostDetailsView.swift4
-rw-r--r--Sora/Views/Post/Grid/PostGridThumbnailView.swift2
-rw-r--r--Sora/Views/Post/Grid/PostGridView.swift2
-rw-r--r--Sora/Views/Settings/Section/SettingsDetailsView.swift8
-rw-r--r--Sora/Views/Settings/Section/SettingsSearchView.swift5
-rw-r--r--Sora/Views/Settings/Section/SettingsThumbnailsView.swift9
-rw-r--r--Sora/Views/Settings/SettingsView.swift3
9 files changed, 31 insertions, 24 deletions
diff --git a/Sora/Data/Settings/Settings.swift b/Sora/Data/Settings/Settings.swift
index 1705b80..fc0a0cc 100644
--- a/Sora/Data/Settings/Settings.swift
+++ b/Sora/Data/Settings/Settings.swift
@@ -2,16 +2,16 @@ import SwiftUI
class Settings: ObservableObject {
@AppStorage("detailViewType")
- var detailViewType: BooruPostFileType = .original
+ var detailViewQuality: BooruPostFileType = .original
- @AppStorage("thumbnailType")
- var thumbnailType: BooruPostFileType = .preview
+ @AppStorage("thumbnailQuality")
+ var thumbnailQuality: BooruPostFileType = .preview
@AppStorage("searchSuggestions")
var searchSuggestions = false
- @AppStorage("columns")
- var columns = 2
+ @AppStorage("thumbnailGridColumns")
+ var thumbnailGridColumns = 2
@AppStorage("blurNSFWThumbnails")
var blurNSFWThumbnails = true
@@ -89,14 +89,10 @@ class Settings: ObservableObject {
}
func resetToDefaults() {
- #if DEBUG
- detailViewType = .preview
- #else
- detailViewType = .original
- #endif
- thumbnailType = .preview
+ detailViewQuality = .original
+ thumbnailQuality = .preview
searchSuggestions = false
- columns = 2
+ thumbnailGridColumns = 2
blurNSFWThumbnails = true
showNSFWPosts = false
}
diff --git a/Sora/Views/Post/Details/PostDetailsImageView.swift b/Sora/Views/Post/Details/PostDetailsImageView.swift
index 7287ec2..a46871c 100644
--- a/Sora/Views/Post/Details/PostDetailsImageView.swift
+++ b/Sora/Views/Post/Details/PostDetailsImageView.swift
@@ -163,7 +163,7 @@ struct PostDetailsImageView<Placeholder: View>: View {
to:
picturesURL
.appendingPathComponent(
- "\(post.id)_\(settings.detailViewType.rawValue.lowercased()).\(url.pathExtension)"
+ "\(post.id)_\(settings.detailViewQuality.rawValue.lowercased()).\(url.pathExtension)"
)
)
diff --git a/Sora/Views/Post/Details/PostDetailsView.swift b/Sora/Views/Post/Details/PostDetailsView.swift
index 34e35d9..c13e61b 100644
--- a/Sora/Views/Post/Details/PostDetailsView.swift
+++ b/Sora/Views/Post/Details/PostDetailsView.swift
@@ -6,7 +6,7 @@ struct PostDetailsView: View {
let post: BooruPost
@State private var loadingStage: BooruPostLoadingState = .loadingPreview
private var imageURL: URL? {
- switch settings.detailViewType {
+ switch settings.detailViewQuality {
case .preview:
post.previewURL
@@ -53,7 +53,7 @@ struct PostDetailsView: View {
Text("Loading Preview…")
case .loadingFile:
- Text("Loading \(settings.detailViewType.rawValue)…")
+ Text("Loading \(settings.detailViewQuality.rawValue)…")
case .loaded:
EmptyView()
diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift
index d362642..7f569a4 100644
--- a/Sora/Views/Post/Grid/PostGridThumbnailView.swift
+++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift
@@ -7,7 +7,7 @@ struct PostGridThumbnailView: View {
let post: BooruPost
let posts: [BooruPost]
private var thumbnailURL: URL? {
- switch settings.thumbnailType {
+ switch settings.thumbnailQuality {
case .preview:
post.previewURL
diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift
index 9853cf4..718c177 100644
--- a/Sora/Views/Post/Grid/PostGridView.swift
+++ b/Sora/Views/Post/Grid/PostGridView.swift
@@ -24,7 +24,7 @@ struct PostGridView: View {
WaterfallGrid(filteredPosts, id: \.id) { post in
waterfallGridContent(post: post)
}
- .gridStyle(columns: settings.columns)
+ .gridStyle(columns: settings.thumbnailGridColumns)
.padding(8)
}
.searchable(text: $manager.searchText, prompt: "Tags")
diff --git a/Sora/Views/Settings/Section/SettingsDetailsView.swift b/Sora/Views/Settings/Section/SettingsDetailsView.swift
index 9009eda..d184382 100644
--- a/Sora/Views/Settings/Section/SettingsDetailsView.swift
+++ b/Sora/Views/Settings/Section/SettingsDetailsView.swift
@@ -4,7 +4,7 @@ struct SettingsDetailsView: View {
@EnvironmentObject var settings: Settings
var body: some View {
- Picker("Detail View Type", selection: $settings.detailViewType) {
+ Picker("Image Quality", selection: $settings.detailViewQuality) {
ForEach(BooruPostFileType.allCases, id: \.self) { type in
Text(type.rawValue.capitalized).tag(type)
}
@@ -15,7 +15,11 @@ struct SettingsDetailsView: View {
Toggle("Display Information Bar", isOn: $settings.displayDetailsInformationBar)
#if os(macOS)
- Toggle("Save Tags to File During Download", isOn: $settings.saveTagsToFile)
+ Toggle(isOn: $settings.saveTagsToFile) {
+ Text("Save Tags to File")
+
+ Text("Saves post tags in a file alongside the downloaded image.")
+ }
#endif
}
}
diff --git a/Sora/Views/Settings/Section/SettingsSearchView.swift b/Sora/Views/Settings/Section/SettingsSearchView.swift
index ee4d09c..5036f72 100644
--- a/Sora/Views/Settings/Section/SettingsSearchView.swift
+++ b/Sora/Views/Settings/Section/SettingsSearchView.swift
@@ -10,12 +10,15 @@ struct SettingsSearchView: View {
#endif
var body: some View {
- Toggle("Suggest Search Tags", isOn: $settings.searchSuggestions)
+ Toggle("Suggest Tags", isOn: $settings.searchSuggestions)
Button(
"Clear Cached Tags (\(manager.cacheSize ?? "Unknown size"))"
) {
manager.clearCachedTags()
}
+ #if os(macOS)
+ .frame(maxWidth: .infinity, alignment: .trailing)
+ #endif
}
}
diff --git a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
index 37871d3..775e7b1 100644
--- a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
+++ b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift
@@ -5,20 +5,20 @@ struct SettingsThumbnailsView: View {
@State private var isShowingContentFiltering = false
var body: some View {
- Picker("Thumbnail Type", selection: $settings.thumbnailType) {
+ Picker("Thumbnail Quality", selection: $settings.thumbnailQuality) {
ForEach(BooruPostFileType.allCases, id: \.self) { type in
Text(type.rawValue.capitalized).tag(type)
}
}
#if os(macOS)
- Picker("Thumbnail Columns", selection: $settings.columns) {
+ Picker("Thumbnail Grid Columns", selection: $settings.thumbnailGridColumns) {
ForEach(1...10, id: \.self) { columns in Text("\(columns)") }
}
#else
Stepper(
- "Thumbnail Columns: \(settings.columns)",
- value: $settings.columns,
+ "Thumbnail Grid Columns: \(settings.thumbnailGridColumns)",
+ value: $settings.thumbnailGridColumns,
in: 1...10
)
#endif
@@ -31,6 +31,7 @@ struct SettingsThumbnailsView: View {
SettingsContentRatingsView()
.frame(minHeight: 250)
}
+ .frame(maxWidth: .infinity, alignment: .trailing)
#else
NavigationLink(destination: SettingsContentRatingsView()) {
Text("Content Filtering")
diff --git a/Sora/Views/Settings/SettingsView.swift b/Sora/Views/Settings/SettingsView.swift
index 2d09168..adc3a49 100644
--- a/Sora/Views/Settings/SettingsView.swift
+++ b/Sora/Views/Settings/SettingsView.swift
@@ -26,6 +26,9 @@ struct SettingsView: View {
Button("Reset to Defaults") {
settings.resetToDefaults()
}
+ #if os(macOS)
+ .frame(maxWidth: .infinity, alignment: .trailing)
+ #endif
}
Section(header: Text("Credits")) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-18 19:55:50 +0000