diff options
| author | Fuwn <[email protected]> | 2025-02-27 20:52:34 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2025-02-27 20:52:34 -0800 |
| commit | bcf51684c9f2346597bfc11d6de47f682c14e416 (patch) | |
| tree | c70d8cd5fc396470aa37f390290590d20e1b6787 /Sora/Views | |
| parent | feat: Development commit (diff) | |
| download | sora-testing-bcf51684c9f2346597bfc11d6de47f682c14e416.tar.xz sora-testing-bcf51684c9f2346597bfc11d6de47f682c14e416.zip | |
feat: Development commit
Diffstat (limited to 'Sora/Views')
| -rw-r--r-- | Sora/Views/Bookmarks/BookmarksListItemView.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Bookmarks/BookmarksView.swift | 6 | ||||
| -rw-r--r-- | Sora/Views/MainView.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Post/Details/PostDetailsImageView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/Details/PostDetailsView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridThumbnailView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Settings/Section/SettingsContentRatingsView.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Settings/Section/SettingsDetailsView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Settings/Section/SettingsProviderView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Settings/Section/SettingsSearchView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Settings/Section/SettingsThumbnailsView.swift | 2 | ||||
| -rw-r--r-- | Sora/Views/Settings/SettingsView.swift | 4 |
14 files changed, 20 insertions, 20 deletions
diff --git a/Sora/Views/Bookmarks/BookmarksListItemView.swift b/Sora/Views/Bookmarks/BookmarksListItemView.swift index 456992e..6f1be95 100644 --- a/Sora/Views/Bookmarks/BookmarksListItemView.swift +++ b/Sora/Views/Bookmarks/BookmarksListItemView.swift @@ -1,8 +1,8 @@ import SwiftUI struct BookmarksListItemView: View { - @EnvironmentObject var settings: Settings - var bookmark: Bookmark + @EnvironmentObject var settings: SettingsManager + var bookmark: SettingsBookmark var body: some View { #if os(macOS) diff --git a/Sora/Views/Bookmarks/BookmarksView.swift b/Sora/Views/Bookmarks/BookmarksView.swift index 5b33d03..6c356b9 100644 --- a/Sora/Views/Bookmarks/BookmarksView.swift +++ b/Sora/Views/Bookmarks/BookmarksView.swift @@ -1,12 +1,12 @@ import SwiftUI struct BookmarksView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @EnvironmentObject var manager: BooruManager @Binding var selectedTab: Int @State private var bookmarksSearchText: String = "" - var filteredBookmarks: [Bookmark] { + var filteredBookmarks: [SettingsBookmark] { guard !bookmarksSearchText.isEmpty else { return settings.bookmarks } @@ -68,6 +68,6 @@ struct BookmarksView: View { #Preview { BookmarksView(selectedTab: .constant(1)) - .environmentObject(Settings()) + .environmentObject(SettingsManager()) .environmentObject(BooruManager(.yandere)) } diff --git a/Sora/Views/MainView.swift b/Sora/Views/MainView.swift index 03612c9..73eeed5 100644 --- a/Sora/Views/MainView.swift +++ b/Sora/Views/MainView.swift @@ -1,7 +1,7 @@ import SwiftUI struct MainView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @State private var selectedTab: Int = 0 @State private var manager = BooruManager(.yandere) @@ -86,7 +86,7 @@ struct MainView: View { #Preview { MainView() - .environmentObject(Settings()) + .environmentObject(SettingsManager()) #if os(macOS) .frame(width: 736, height: 736) #endif diff --git a/Sora/Views/Post/Details/PostDetailsImageView.swift b/Sora/Views/Post/Details/PostDetailsImageView.swift index 702d0a0..a50b6fc 100644 --- a/Sora/Views/Post/Details/PostDetailsImageView.swift +++ b/Sora/Views/Post/Details/PostDetailsImageView.swift @@ -3,7 +3,7 @@ import SwiftUI import UserNotifications struct PostDetailsImageView<Placeholder: View>: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @EnvironmentObject var manager: BooruManager var url: URL? @Binding var loadingState: BooruPostLoadingState diff --git a/Sora/Views/Post/Details/PostDetailsView.swift b/Sora/Views/Post/Details/PostDetailsView.swift index c13e61b..596cbbd 100644 --- a/Sora/Views/Post/Details/PostDetailsView.swift +++ b/Sora/Views/Post/Details/PostDetailsView.swift @@ -2,7 +2,7 @@ import SwiftUI struct PostDetailsView: View { @EnvironmentObject var manager: BooruManager - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager let post: BooruPost @State private var loadingStage: BooruPostLoadingState = .loadingPreview private var imageURL: URL? { diff --git a/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift index d0a709b..c8478ee 100644 --- a/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift +++ b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift @@ -2,7 +2,7 @@ import SwiftUI struct PostGridBookmarkButtonView: View { @EnvironmentObject private var manager: BooruManager - @EnvironmentObject private var settings: Settings + @EnvironmentObject private var settings: SettingsManager var contained: Bool { let lowercaseTags = manager.tags.map { $0.lowercased() } diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift index 7f569a4..4973c1e 100644 --- a/Sora/Views/Post/Grid/PostGridThumbnailView.swift +++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift @@ -2,7 +2,7 @@ import NetworkImage import SwiftUI struct PostGridThumbnailView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @EnvironmentObject var manager: BooruManager let post: BooruPost let posts: [BooruPost] diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift index 3da87d4..a643391 100644 --- a/Sora/Views/Post/Grid/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -2,7 +2,7 @@ import SwiftUI import WaterfallGrid struct PostGridView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @EnvironmentObject var manager: BooruManager @Environment(\.isSearching) diff --git a/Sora/Views/Settings/Section/SettingsContentRatingsView.swift b/Sora/Views/Settings/Section/SettingsContentRatingsView.swift index 7053481..39524ec 100644 --- a/Sora/Views/Settings/Section/SettingsContentRatingsView.swift +++ b/Sora/Views/Settings/Section/SettingsContentRatingsView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsContentRatingsView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager var body: some View { List { @@ -70,5 +70,5 @@ struct SettingsContentRatingsView: View { #Preview { SettingsContentRatingsView() - .environmentObject(Settings()) + .environmentObject(SettingsManager()) } diff --git a/Sora/Views/Settings/Section/SettingsDetailsView.swift b/Sora/Views/Settings/Section/SettingsDetailsView.swift index d184382..5abd394 100644 --- a/Sora/Views/Settings/Section/SettingsDetailsView.swift +++ b/Sora/Views/Settings/Section/SettingsDetailsView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsDetailsView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager var body: some View { Picker("Image Quality", selection: $settings.detailViewQuality) { diff --git a/Sora/Views/Settings/Section/SettingsProviderView.swift b/Sora/Views/Settings/Section/SettingsProviderView.swift index 1de25c3..b561bc3 100644 --- a/Sora/Views/Settings/Section/SettingsProviderView.swift +++ b/Sora/Views/Settings/Section/SettingsProviderView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsProviderView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager var body: some View { Picker("Provider", selection: $settings.preferredBooru) { diff --git a/Sora/Views/Settings/Section/SettingsSearchView.swift b/Sora/Views/Settings/Section/SettingsSearchView.swift index f8fa270..cb0d3c7 100644 --- a/Sora/Views/Settings/Section/SettingsSearchView.swift +++ b/Sora/Views/Settings/Section/SettingsSearchView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsSearchView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager #if os(macOS) var manager = BooruManager(.yandere) diff --git a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift index 775e7b1..5378165 100644 --- a/Sora/Views/Settings/Section/SettingsThumbnailsView.swift +++ b/Sora/Views/Settings/Section/SettingsThumbnailsView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsThumbnailsView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager @State private var isShowingContentFiltering = false var body: some View { diff --git a/Sora/Views/Settings/SettingsView.swift b/Sora/Views/Settings/SettingsView.swift index adc3a49..a9c8141 100644 --- a/Sora/Views/Settings/SettingsView.swift +++ b/Sora/Views/Settings/SettingsView.swift @@ -1,7 +1,7 @@ import SwiftUI struct SettingsView: View { - @EnvironmentObject var settings: Settings + @EnvironmentObject var settings: SettingsManager var body: some View { NavigationStack { @@ -45,6 +45,6 @@ struct SettingsView: View { #Preview { SettingsView() - .environmentObject(Settings()) + .environmentObject(SettingsManager()) .environmentObject(BooruManager(.yandere)) } |