Merge branch '155-ui-for-gamifcation-stats' of...

Merge branch '155-ui-for-gamifcation-stats' of git.imp.fu-berlin.de:enzevalos/enzevalos_iphone into 155-ui-for-gamifcation-stats
PLEASE REVISIT
# Conflicts:
#	enzevalos_iphone/BadgeCaseView.swift

enzevalos_iphone/BadgeCaseView.swift

@@ -15,6 +15,14 @@ struct BadgeCaseView: View {
     
     let badges: [Badge] = GamificationData.sharedInstance.badges.map { Badge(type: $0.type, description: $0.displayName, imageOn: $0.onName, imageOff: $0.offName, isActive: $0.isAchieved()) }
     
+    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)
+        }
+    }
+    
     var body: some View {
         NavigationView {
             VStack {
@@ -33,40 +41,54 @@ struct BadgeCaseView: View {
         ))
         }
     }
-}
 
-private func goBack() {
-    if let win = AppDelegate.getAppDelegate().window {
-        if let root = win.rootViewController {
-            print("Appdelegates current root: \(root.debugDescription)")
-            if let navi = root.navigationController {
-                   navi.popViewController(animated: true)
-            }
-            else if let root = root as? UINavigationController {
-                print("Root is a UINavigationController -> we can pop!")
-                root.popViewController(animated: true)
-            }
-            else {
-                if let coord = AppDelegate.getAppDelegate().inboxCoordinator {
-                    print("Inbox coord root: \(coord.root.topViewController.debugDescription)")
-                    coord.root.popViewController(animated: true)
+    private func goBack() {
+        if let win = AppDelegate.getAppDelegate().window {
+            if let root = win.rootViewController {
+                print("Appdelegates current root: \(root.debugDescription)")
+                if let navi = root.navigationController {
+                       navi.popViewController(animated: true)
                 }
-               }
+                else if let root = root as? UINavigationController {
+                    print("Root is a UINavigationController -> we can pop!")
+                    root.popViewController(animated: true)
+                }
+                else {
+                    if let coord = AppDelegate.getAppDelegate().inboxCoordinator {
+                        print("Inbox coord root: \(coord.root.topViewController.debugDescription)")
+                        coord.root.popViewController(animated: true)
+                    }
+                   }
+            }
         }
     }
-   
-}
-private var titleIcon: some View {
-    HStack{
-        Image("verschluesseltOn")
-            .resizable()
-            .scaledToFit()
-            .frame(width: 40,height: 40)
-            .padding(10)
+       
+
+    private var titleIcon: some View {
+        HStack{
+            Image("verschluesseltOn")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 40,height: 40)
+                .padding(10)
+        }
     }
+        private var backButton: some View {
+            VStack {
+                Button(action: goBack) {
+                    Text("< My ID")
+                }
+            }
+        }
+        /*
+        func goBack() {
+            if let coord = AppDelegate.getAppDelegate().inboxCoordinator {
+                coord.pushInbox()
+            }
+        }
+     */
 }
 
-
 struct Badge: Identifiable {
     var id = UUID()
     var type: BadgeType

enzevalos_iphone/SwiftUI/Inbox/Inbox.swift

@@ -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()
+ }
+ }
  */