diff options
Diffstat (limited to 'Sora/Views/Post')
9 files changed, 21 insertions, 12 deletions
diff --git a/Sora/Views/Post/Details/Carousel/PostDetailsCarouselView.swift b/Sora/Views/Post/Details/Carousel/PostDetailsCarouselView.swift index e43be47..55d6243 100644 --- a/Sora/Views/Post/Details/Carousel/PostDetailsCarouselView.swift +++ b/Sora/Views/Post/Details/Carousel/PostDetailsCarouselView.swift @@ -2,7 +2,8 @@ import SwiftUI struct PostDetailsCarouselView: View { @EnvironmentObject var manager: BooruManager - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings let posts: [BooruPost] let focusedPost: BooruPost? let onFocusedPostChange: (BooruPost) -> Void diff --git a/Sora/Views/Post/Details/PostDetailsImageView.swift b/Sora/Views/Post/Details/PostDetailsImageView.swift index 5b954a6..009dbed 100644 --- a/Sora/Views/Post/Details/PostDetailsImageView.swift +++ b/Sora/Views/Post/Details/PostDetailsImageView.swift @@ -3,7 +3,8 @@ import SwiftUI import UserNotifications struct PostDetailsImageView<Placeholder: View>: View { // swiftlint:disable:this type_body_length - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings @EnvironmentObject var manager: BooruManager var url: URL? @Binding var loadingState: BooruPostLoadingState diff --git a/Sora/Views/Post/Details/PostDetailsTagsView.swift b/Sora/Views/Post/Details/PostDetailsTagsView.swift index 72ba757..f843b6c 100644 --- a/Sora/Views/Post/Details/PostDetailsTagsView.swift +++ b/Sora/Views/Post/Details/PostDetailsTagsView.swift @@ -2,7 +2,8 @@ import SwiftUI struct PostDetailsTagsView: View { @EnvironmentObject var manager: BooruManager - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings @Binding var isPresented: Bool @Binding var navigationPath: NavigationPath var tags: [String] @@ -101,5 +102,5 @@ struct PostDetailsTagsView: View { tags: ["hololive", "absurdres", "nekomimi"] ) .environmentObject(BooruManager(.danbooru)) - .environmentObject(SettingsManager()) + .environment(SettingsManager()) } diff --git a/Sora/Views/Post/Details/PostDetailsView.swift b/Sora/Views/Post/Details/PostDetailsView.swift index bb58c49..d8a77c6 100644 --- a/Sora/Views/Post/Details/PostDetailsView.swift +++ b/Sora/Views/Post/Details/PostDetailsView.swift @@ -2,7 +2,8 @@ import SwiftUI struct PostDetailsView: View { @EnvironmentObject var manager: BooruManager - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings let post: BooruPost @Binding var navigationPath: NavigationPath @State private var loadingStage: BooruPostLoadingState = .loadingPreview diff --git a/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift index 2dadfc3..020e0ce 100644 --- a/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift +++ b/Sora/Views/Post/Grid/PostGridBookmarkButtonView.swift @@ -2,7 +2,8 @@ import SwiftUI struct PostGridBookmarkButtonView: View { @EnvironmentObject private var manager: BooruManager - @EnvironmentObject private var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings let tags: [String] let provider: BooruProvider diff --git a/Sora/Views/Post/Grid/PostGridFavoriteButtonView.swift b/Sora/Views/Post/Grid/PostGridFavoriteButtonView.swift index bd6b6f9..c6ecd7f 100644 --- a/Sora/Views/Post/Grid/PostGridFavoriteButtonView.swift +++ b/Sora/Views/Post/Grid/PostGridFavoriteButtonView.swift @@ -2,7 +2,8 @@ import SwiftUI struct PostGridFavoriteButtonView: View { @EnvironmentObject private var manager: BooruManager - @EnvironmentObject private var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings let post: BooruPost var isFavorited: Bool { @@ -40,6 +41,6 @@ struct PostGridFavoriteButtonView: View { ) PostGridFavoriteButtonView(post: samplePost) - .environmentObject(SettingsManager()) + .environment(SettingsManager()) .environmentObject(BooruManager(.yandere)) } diff --git a/Sora/Views/Post/Grid/PostGridSearchHistoryView.swift b/Sora/Views/Post/Grid/PostGridSearchHistoryView.swift index bc7c52a..fcadea1 100644 --- a/Sora/Views/Post/Grid/PostGridSearchHistoryView.swift +++ b/Sora/Views/Post/Grid/PostGridSearchHistoryView.swift @@ -1,7 +1,8 @@ import SwiftUI struct PostGridSearchHistoryView: View { - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings @Binding var selectedTab: Int @Binding var isPresented: Bool @@ -30,6 +31,6 @@ struct PostGridSearchHistoryView: View { selectedTab: .constant(0), isPresented: .constant(true) ) - .environmentObject(SettingsManager()) + .environment(SettingsManager()) .environmentObject(BooruManager(.safebooru)) } diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift index 5f7829e..fade59b 100644 --- a/Sora/Views/Post/Grid/PostGridThumbnailView.swift +++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift @@ -2,7 +2,8 @@ import NetworkImage import SwiftUI struct PostGridThumbnailView: View { - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings @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 330e294..77e96aa 100644 --- a/Sora/Views/Post/Grid/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -3,7 +3,8 @@ import SwiftUI struct PostGridView: View { // swiftlint:disable:this type_body_length - @EnvironmentObject var settings: SettingsManager + @Environment(SettingsManager.self) + private var settings @EnvironmentObject var manager: BooruManager @State private var isSearchHistoryPresented = false @State private var isSettingsPresented = false |