From e3aa8d28559cb217f7670aa3886f07f54aff574c Mon Sep 17 00:00:00 2001
From: Chris Offner <chrisoffner@pm.me>
Date: Thu, 18 Mar 2021 12:18:10 +0100
Subject: [PATCH] Fixed error in MailListView.
---
.../SwiftUI/Inbox/MailListView.swift | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
index 159ae41b..5d8eb173 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
@@ -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){
--
GitLab