Skip to content
Snippets Groups Projects
Commit 7f1a3d4f authored by cpilaszewicz's avatar cpilaszewicz
Browse files

Fix indentation

parent a5d621cc
No related branches found
No related tags found
2 merge requests!58Onboarding screens swift ui merge dev,!56Create badge case screen
......@@ -25,7 +25,7 @@ struct Inbox: View {
var body: some View {
VStack{
SearchView(searchText: $searchText, searchField: $searchField, searchNow: $searchNow)
.padding(6)
.padding(6)
// Mails
mailList
// Toolbar
......@@ -46,10 +46,10 @@ struct Inbox: View {
List (self.keyrecords.filter(filterKeyRecord), id: \.self){
record in
KeyRecordRow(keyrecord: record, coord: self.coord).environment(\.managedObjectContext, self.managedObjectContext)
}
.resignKeyboardOnDragGesture() // hide keyboard when dragging
}
.resignKeyboardOnDragGesture() // hide keyboard when dragging
}
private var folderButton: some View {
Button(action: self.coord.pushFoldersView, label: {
Text(NSLocalizedString("Folders", comment: "Folder"))
......@@ -74,7 +74,7 @@ struct Inbox: View {
var text = NSLocalizedString("Updating", comment: "updating...")
if !updating {
if let last = Folder.inbox.lastUpdate {
let dateFormatter = DateFormatter()
let dateFormatter = DateFormatter()
dateFormatter.locale = Locale.current
dateFormatter.timeStyle = .medium
let dateString = dateFormatter.string(from: last)
......@@ -86,56 +86,56 @@ struct Inbox: View {
}
return Button(action: updateMails, label: {Text(text)
.font(.callout)
})
}
var userRecord: KeyRecord {
get {
let keyID = UserManager.loadUserValue(Attribute.prefSecretKeyID) as? String
let addr = UserManager.loadUserValue(Attribute.userAddr) as! String
return DataHandler.handler.getKeyRecord(addr: addr, keyID: keyID)
}
}
func updateMails() {
guard !updating else {
return
}
AppDelegate.getAppDelegate().mailHandler.updateFolder(folder: Folder.inbox, completionCallback: {_ in
self.updating = false
})
updating = true
}
func filterKeyRecord(keyRecord: KeyRecord) -> Bool {
let searchType = SearchType.findType(i: searchField)
if self.searchText.isEmpty || self.searchText == NSLocalizedString("Searchbar.Title", comment: "Search") {
return true
}
let query = self.searchText.lowercased()
if (searchType == .All || searchType == .Sender) && containsSearchTerms(content: keyRecord.name, searchText: query){
return true
}
else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.mailAddress, searchText: query)}).count > 0 {
return true
}
else if (searchType == .All || searchType == .Subject) && keyRecord.mails.filter({containsSearchTerms(content: $0.subject, searchText: query)}).count > 0 {
return true
}
else if (searchType == .All || searchType == .Body) && keyRecord.mails.filter({containsSearchTerms(content: $0.body, searchText: query)}).count > 0 {
return true
}
return false
}
get {
let keyID = UserManager.loadUserValue(Attribute.prefSecretKeyID) as? String
let addr = UserManager.loadUserValue(Attribute.userAddr) as! String
return DataHandler.handler.getKeyRecord(addr: addr, keyID: keyID)
}
}
func updateMails() {
guard !updating else {
return
}
AppDelegate.getAppDelegate().mailHandler.updateFolder(folder: Folder.inbox, completionCallback: {_ in
self.updating = false
})
updating = true
}
func filterKeyRecord(keyRecord: KeyRecord) -> Bool {
let searchType = SearchType.findType(i: searchField)
if self.searchText.isEmpty || self.searchText == NSLocalizedString("Searchbar.Title", comment: "Search") {
return true
}
let query = self.searchText.lowercased()
if (searchType == .All || searchType == .Sender) && containsSearchTerms(content: keyRecord.name, searchText: query){
return true
}
else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.mailAddress, searchText: query)}).count > 0 {
return true
}
else if (searchType == .All || searchType == .Subject) && keyRecord.mails.filter({containsSearchTerms(content: $0.subject, searchText: query)}).count > 0 {
return true
}
else if (searchType == .All || searchType == .Body) && keyRecord.mails.filter({containsSearchTerms(content: $0.body, searchText: query)}).count > 0 {
return true
}
return false
}
}
/*
struct Inbox_Previews: PreviewProvider {
static var previews: some View {
Inbox()
}
}
struct Inbox_Previews: PreviewProvider {
static var previews: some View {
Inbox()
}
}
*/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment