Skip to content
Snippets Groups Projects
Commit e3aa8d28 authored by cruxfilm's avatar cruxfilm
Browse files

Fixed error in MailListView.

parent 10f1987b
No related branches found
No related tags found
1 merge request!74Integration of new ComposeView
......@@ -32,21 +32,21 @@ struct MailListView: View {
self.name = name
}
var body: some View {
mainView
mainView
.navigationBarTitle(name, displayMode: .inline)
.onAppear(perform: {
self.updateMails()
})
.sheet(isPresented: $composeMail) {
ComposeView()
}
.onAppear(perform: {
self.updateMails()
})
.sheet(isPresented: $composeMail) {
ComposeView()
}
}
private var mainView: some View {
VStack (alignment: .leading){
SearchView(searchText: $searchText, searchField: $searchField, searchNow: $searchNow)
.padding(6)
.padding(6)
mailList
.padding(-10)
// Toolbar
......@@ -67,8 +67,8 @@ struct MailListView: View {
destination: ReadMainView(model: ReadModel(mail: record))) {
MailRow(mail: record)
}
}
.resignKeyboardOnDragGesture() // hide keyboard when dragging
}
.resignKeyboardOnDragGesture() // hide keyboard when dragging
}
private var idButton: some View {
......@@ -125,7 +125,7 @@ struct MailListView: View {
if (searchType == .All || searchType == .Sender) && (containsSearchTerms(content: keyRecord.sender.displayname, searchText: query) || containsSearchTerms(content: keyRecord.sender.email, searchText: query)) {
return true
}
else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.mailAddress, searchText: query)}).count > 0 {
else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.email, searchText: query)}).count > 0 {
return true
}
else if (searchType == .All || searchType == .Subject) && containsSearchTerms(content: keyRecord.subject, searchText: query){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment