diff --git a/V2er/View/FeedDetail/FeedDetailPage.swift b/V2er/View/FeedDetail/FeedDetailPage.swift index d5e577f..5f5a399 100644 --- a/V2er/View/FeedDetail/FeedDetailPage.swift +++ b/V2er/View/FeedDetail/FeedDetailPage.swift @@ -20,7 +20,6 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable { @Environment(\.isPresented) private var isPresented @Environment(\.dismiss) var dismiss @EnvironmentObject private var store: Store - @State var rendered: Bool = false @State private var showingSafari = false @State private var safariURL: URL? @State private var showingMobileWeb = false @@ -62,11 +61,6 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable { return contentInfo == nil || contentInfo!.html.isEmpty } - private var showProgressView: Bool { - return state.showProgressView - || (!isContentEmpty && !self.rendered) - } - private func shareTopicContent() { let title = state.model.headerInfo?.title ?? "V2EX 话题" let urlString = APIService.baseUrlString + "/t/\(id)" @@ -155,7 +149,7 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable { // Content Section if !isContentEmpty { - NewsContentView(state.model.contentInfo, rendered: $rendered) + NewsContentView(state.model.contentInfo) .padding(.horizontal, 10) .listRowInsets(EdgeInsets()) .listRowSeparator(.hidden) @@ -210,12 +204,6 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable { .refreshable { await run(action: FeedDetailActions.FetchData.Start(id: instanceId, feedId: initData?.id)) } - .overlay { - if showProgressView { - ProgressView() - .scaleEffect(1.5) - } - } .onTapGesture { replyIsFocused = false } diff --git a/V2er/View/FeedDetail/NewsContentView.swift b/V2er/View/FeedDetail/NewsContentView.swift index b7df99e..3a1c0c9 100644 --- a/V2er/View/FeedDetail/NewsContentView.swift +++ b/V2er/View/FeedDetail/NewsContentView.swift @@ -10,15 +10,13 @@ import SwiftUI struct NewsContentView: View { var contentInfo: FeedDetailInfo.ContentInfo? - @Binding var rendered: Bool @EnvironmentObject var store: Store @Environment(\.colorScheme) var colorScheme @State private var showingSafari = false @State private var safariURL: URL? - init(_ contentInfo: FeedDetailInfo.ContentInfo?, rendered: Binding) { + init(_ contentInfo: FeedDetailInfo.ContentInfo?) { self.contentInfo = contentInfo - self._rendered = rendered } var body: some View { @@ -34,16 +32,6 @@ struct NewsContentView: View { // Open image in SafariView for now openInSafari(url) } - .onRenderCompleted { metadata in - // Mark as rendered after content is ready - DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { - self.rendered = true - } - } - .onRenderFailed { error in - print("Render error: \(error)") - self.rendered = true - } .padding(.horizontal, 12) .padding(.vertical, 8)