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

refactor: dms view init logic

Browse Source
This commit is contained in:
William Casarin
2023-04-14 10:17:24 -07:00
parent 8c19ec1532
commit 40468b1603
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
damus/ContentView.swift
View File

@@ -185,7 +185,6 @@ struct ContentView: View {
case .dms: case .dms:
DirectMessagesView(damus_state: damus_state!) DirectMessagesView(damus_state: damus_state!)
.environmentObject(home.dms)
case .none: case .none:
EmptyView() EmptyView()

11
damus/Views/DirectMessagesView.swift
View File

@@ -17,13 +17,14 @@ struct DirectMessagesView: View {
@State var dm_type: DMType = .friend @State var dm_type: DMType = .friend
@State var open_dm: Bool = false @State var open_dm: Bool = false
@State var pubkey: String = "" @State var pubkey: String
@EnvironmentObject var model: DirectMessagesModel @ObservedObject var model: DirectMessagesModel
@State var active_model: DirectMessageModel @State var active_model: DirectMessageModel = DirectMessageModel(our_pubkey: "")
init(damus_state: DamusState) { init(damus_state: DamusState) {
self.damus_state = damus_state self.damus_state = damus_state
self._active_model = State(initialValue: DirectMessageModel(our_pubkey: damus_state.pubkey)) self._model = ObservedObject(initialValue: damus_state.dms)
self.pubkey = damus_state.pubkey
} }
func MainContent(requests: Bool) -> some View { func MainContent(requests: Bool) -> some View {
@@ -106,8 +107,6 @@ struct DirectMessagesView_Previews: PreviewProvider {
kind: 4, kind: 4,
tags: []) tags: [])
let ds = test_damus_state() let ds = test_damus_state()
let model = DirectMessageModel(events: [ev], our_pubkey: ds.pubkey)
DirectMessagesView(damus_state: ds) DirectMessagesView(damus_state: ds)
.environmentObject(model)
} }
} }