From 2906fecf5ce04029e71a5d1af17cccb462b1feb7 Mon Sep 17 00:00:00 2001 From: Sam DuBois Date: Sun, 18 Dec 2022 18:35:03 -0700 Subject: [PATCH] Realized that I didn't actually need to move everything out into a view model. Well oh well im sure it will come in handy eventually --- damus/Views/SearchHomeView.swift | 10 +++++++++- damus/Views/TimelineView.swift | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/damus/Views/SearchHomeView.swift b/damus/Views/SearchHomeView.swift index 617da771..0fe98d40 100644 --- a/damus/Views/SearchHomeView.swift +++ b/damus/Views/SearchHomeView.swift @@ -39,11 +39,19 @@ struct SearchHomeView: View { } var GlobalContent: some View { - TimelineView(events: $model.events, loading: $model.loading, damus: damus_state, show_friend_icon: true, filter: { _ in true }) + return TimelineView(events: $model.events, loading: $model.loading, damus: damus_state, show_friend_icon: true, filter: { _ in true }) + .refreshable { + // Fetch new information by resubscribing to the relay + model.subscribe() + } } var SearchContent: some View { SearchResultsView(damus_state: damus_state, search: $search) + .refreshable { + // Fetch new information by resubscribing to the relay + model.subscribe() + } } var MainContent: some View { diff --git a/damus/Views/TimelineView.swift b/damus/Views/TimelineView.swift index 5a25d971..08f1a5c0 100644 --- a/damus/Views/TimelineView.swift +++ b/damus/Views/TimelineView.swift @@ -34,9 +34,6 @@ struct InnerTimelineView: View { } } .padding(.horizontal) - .refreshable { - print("Hello World") - } } } @@ -60,6 +57,9 @@ struct InnerTimelineRedactedView: View { } struct TimelineView: View { + + @EnvironmentObject var viewModel: DamusViewModel + @Binding var events: [NostrEvent] @Binding var loading: Bool