diff --git a/enzevalos_iphone/Badges.swift b/enzevalos_iphone/Badges.swift index 74092094f39d678d33f0ebabb5fab15e1eb1464f..90b86d5548ae3361f58a9df04235a69ed2841e38 100755 --- a/enzevalos_iphone/Badges.swift +++ b/enzevalos_iphone/Badges.swift @@ -17,7 +17,7 @@ import UIKit enum BadgeType : Int { case keyMaster case trustmaster - case verschlüsselMaster + case encMaster case firstMail case quizmaster case onBoarding diff --git a/enzevalos_iphone/Gamification.storyboard b/enzevalos_iphone/Gamification.storyboard index ff26874d6f419c525dd5e950e513a7a2618ebb02..420f5bb097cb71b75a860673cf0d26b5fa35478e 100755 --- a/enzevalos_iphone/Gamification.storyboard +++ b/enzevalos_iphone/Gamification.storyboard @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1611" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fps-Pq-pci"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fps-Pq-pci"> <device id="retina4_7" orientation="portrait"> <adaptation id="fullscreen"/> </device> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/> <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/> <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/> @@ -783,7 +783,7 @@ <navigationController automaticallyAdjustsScrollViewInsets="NO" id="fps-Pq-pci" sceneMemberID="viewController"> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="MNB-W4-Xxh"> - <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <rect key="frame" x="0.0" y="20" width="375" height="44"/> <autoresizingMask key="autoresizingMask"/> </navigationBar> <nil name="viewControllers"/> diff --git a/enzevalos_iphone/GamificationData.swift b/enzevalos_iphone/GamificationData.swift index c7b356735e78ac7a1b4a11648d4ca7a37df5ee45..7927bc5f851b734c84f65cea5c799793e383e882 100755 --- a/enzevalos_iphone/GamificationData.swift +++ b/enzevalos_iphone/GamificationData.swift @@ -60,7 +60,6 @@ class GamificationData: NSObject { Badges(pictureOff: "keymasterOff", pictureOn: "keymasterOn", displayName: NSLocalizedString("My own Set of Keys", comment:"My own Set of Keys" )), Badges(pictureOff: "keymasterOff", pictureOn: "keymasterOn", displayName: NSLocalizedString("Sent first Encrypted Mail", comment: "Sent first Encrypted Mail"), achievmentsNeeded: [.SecureSend]), Badges(pictureOff: "keymasterOff", pictureOn: "keymasterOn", displayName: NSLocalizedString("Received first Encrypted Mail", comment: "Received first Encrypted Mail" ), achievmentsNeeded: [.SecureReceived] ), - // Badges(pictureOff: "keymasterOff", pictureOn: "keymasterOff", displayName: NSLocalizedString("Onboarding Complete", comment: "Onboarding Complete" )), ] case .MailMaster: return [ @@ -97,7 +96,7 @@ class GamificationData: NSObject { func get3LastAchieved() -> [Badges] { // check if new achieved for element in self.badges { - self.badgeAchieved(badge: element) + _ = self.badgeAchieved(badge: element) } @@ -133,9 +132,7 @@ class GamificationData: NSObject { } } - return result //[ - // Badges.init(type: .inviteAFriend, pictureOff: "invitefriendOff", pictureOn: "invitefriendOn", segue: .inviteFriend, displayName: NSLocalizedString("Invite a friend", comment: "Invite a friend" )) - // ] + return result } @@ -327,7 +324,10 @@ class GamificationData: NSObject { let mailsCount : Int = mailsSend + secureMailsSend + mailsReceived + secureMailsReceived let secureMailsCount : Int = secureMailsReceived + secureMailsSend let totalMails : Int = mailsCount + secureMailsCount - return ( Float(secureContactsCount) / Float(contacts.count) , Float(secureMailsCount) / Float(totalMails) ) + + let a = contacts.count == 0 ? 0 : Float(secureContactsCount) / Float(contacts.count) + let b = totalMails == 0 ? 0 : Float(secureMailsCount) / Float(totalMails) + return ( a, b ) } } diff --git "a/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOff.imageset/verschlu\314\210sselmaster_g_3x.png" "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOff.imageset/verschlu\314\210sselmaster_g_3x.png" new file mode 100644 index 0000000000000000000000000000000000000000..5b87a9f4afe589030be91b1ddb2c354dffd42fe5 Binary files /dev/null and "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOff.imageset/verschlu\314\210sselmaster_g_3x.png" differ diff --git "a/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOn.imageset/verschlu\314\210sselmaster_f_3x.png" "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOn.imageset/verschlu\314\210sselmaster_f_3x.png" new file mode 100644 index 0000000000000000000000000000000000000000..1004a245053722bf8c2540465935b53a05372390 Binary files /dev/null and "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesselmasterOn.imageset/verschlu\314\210sselmaster_f_3x.png" differ diff --git "a/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOff.imageset/verchlu\314\210sselt_g_3x.png" "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOff.imageset/verchlu\314\210sselt_g_3x.png" new file mode 100644 index 0000000000000000000000000000000000000000..71c8158a71a6c05c1b978bc3f66cfc92d027acca Binary files /dev/null and "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOff.imageset/verchlu\314\210sselt_g_3x.png" differ diff --git "a/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOn.imageset/verschlu\314\210sselt_f_3x.png" "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOn.imageset/verschlu\314\210sselt_f_3x.png" new file mode 100644 index 0000000000000000000000000000000000000000..171cd1f57202dfe1c59892f1d521b33f2544ab58 Binary files /dev/null and "b/enzevalos_iphone/GamificationElements.xcassets/Badges/verschluesseltOn.imageset/verschlu\314\210sselt_f_3x.png" differ diff --git a/enzevalos_iphone/InviteFriendViewController.swift b/enzevalos_iphone/InviteFriendViewController.swift index a7ee72ba1bde7fb9c0bd4aef8578108d849b152a..a5e50e6ad921216748ef16dc70873d4db5c7f3f4 100755 --- a/enzevalos_iphone/InviteFriendViewController.swift +++ b/enzevalos_iphone/InviteFriendViewController.swift @@ -227,7 +227,6 @@ class InviteFriendViewController: UIViewController, UITableViewDataSource, UITab time.timeStyle = .short time.locale = Locale.current - let myAddress = UserManager.loadUserValue(Attribute.userAddr)// as! String let subject = NSLocalizedString("inviteSubject", comment: "Subject for the invitation mail") diff --git a/enzevalos_iphone/ReadViewController.swift b/enzevalos_iphone/ReadViewController.swift index b46c00d3f8b68983f435d6b92505e2a2e0ea25e8..41bf6e3fb6d42d3b93a69e36be54f1725b4afc71 100644 --- a/enzevalos_iphone/ReadViewController.swift +++ b/enzevalos_iphone/ReadViewController.swift @@ -92,6 +92,7 @@ class ReadViewController: UITableViewController { let keyWrapper = EnzevalosEncryptionHandler.getEncryption(.PGP)?.getKey(x.key!) keyDiscoveryDate = keyWrapper?.discoveryTime } + return ""//nil //M } }