tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Only reload global view on pulldown refresh"

Browse Source 
This reverts commit a4d62d295c.
This commit is contained in:
William Casarin
2022-12-26 19:01:53 -08:00
parent d84320bb2c
commit fae626b6c7
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
damus/ContentView.swift
View File

@@ -68,8 +68,6 @@ struct ContentView: View {
@State var thread_open: Bool = false @State var thread_open: Bool = false
@State var search_open: Bool = false @State var search_open: Bool = false
@State var filter_state : FilterState = .posts_and_replies @State var filter_state : FilterState = .posts_and_replies
@StateObject var search: SearchHomeModel = SearchHomeModel()
@StateObject var home: HomeModel = HomeModel() @StateObject var home: HomeModel = HomeModel()
// connect retry timer // connect retry timer
@@ -135,7 +133,7 @@ struct ContentView: View {
} }
switch selected_timeline { switch selected_timeline {
case .search: case .search:
SearchHomeView(damus_state: damus_state!, model: search) SearchHomeView(damus_state: damus_state!, model: SearchHomeModel(damus_state: damus_state!))
case .home: case .home:
PostingTimelineView PostingTimelineView
@@ -405,7 +403,6 @@ struct ContentView: View {
dms: home.dms dms: home.dms
) )
home.damus_state = self.damus_state! home.damus_state = self.damus_state!
search.damus_state = self.damus_state!
pool.connect() pool.connect()
} }

9
damus/Models/SearchHomeModel.swift
View File

@@ -10,18 +10,17 @@ import Foundation
/// The data model for the SearchHome view, typically something global-like /// The data model for the SearchHome view, typically something global-like
class SearchHomeModel: ObservableObject { class SearchHomeModel: ObservableObject {
@Published var events: [NostrEvent] @Published var events: [NostrEvent] = []
@Published var loading: Bool = false @Published var loading: Bool = false
var seen_pubkey: Set<String> = Set() var seen_pubkey: Set<String> = Set()
var damus_state: DamusState let damus_state: DamusState
let base_subid = UUID().description let base_subid = UUID().description
let profiles_subid = UUID().description let profiles_subid = UUID().description
let limit: UInt32 = 250 let limit: UInt32 = 250
init() { init(damus_state: DamusState) {
self.events = [] self.damus_state = damus_state
self.damus_state = .empty
} }
func get_base_filter() -> NostrFilter { func get_base_filter() -> NostrFilter {

7
damus/Views/SearchHomeView.swift
View File

@@ -10,7 +10,7 @@ import CryptoKit
struct SearchHomeView: View { struct SearchHomeView: View {
let damus_state: DamusState let damus_state: DamusState
@ObservedObject var model: SearchHomeModel @StateObject var model: SearchHomeModel
@State var search: String = "" @State var search: String = ""
var SearchInput: some View { var SearchInput: some View {
@@ -97,15 +97,12 @@ struct SearchHomeView: View {
} }
} }
/*
struct SearchHomeView_Previews: PreviewProvider { struct SearchHomeView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
let state = test_damus_state() let state = test_damus_state()
SearchHomeView( SearchHomeView(
damus_state: state, damus_state: state,
model: SearchHomeModel() model: SearchHomeModel(damus_state: state)
) )
} }
} }
*/