update trackers info on the overview screen

Core/SiteRating.swift

@@ -55,7 +55,15 @@ public class SiteRating {
 
         return nil
     }
-
+
+    public var majorTrackersDetected: Int {
+        return majorTrackers(trackers: trackersDetected)
+    }
+
+    public var majorTrackersBlocked: Int {
+        return majorTrackers(trackers: trackersBlocked)
+    }
+
     public var containsMajorTracker: Bool {
         return trackersDetected.contains(where: { $0.key.fromMajorNetwork } )
     }
@@ -72,7 +80,7 @@ public class SiteRating {
         let detectedCount = trackersDetected[tracker] ?? 0
         trackersDetected[tracker] = detectedCount + 1
 
-        if blocked{
+        if blocked {
             let blockCount = trackersBlocked[tracker] ?? 0  
             trackersBlocked[tracker] = blockCount + 1
         }
@@ -93,4 +101,9 @@ public class SiteRating {
     public var totalTrackersBlocked: Int {
         return trackersBlocked.reduce(0) { $0 + $1.value }
     }
+
+    private func majorTrackers(trackers: [Tracker: Int]) -> Int {
+        return Set(trackers.keys.filter({ $0.fromMajorNetwork }).flatMap({ $0.parentDomain })).count
+    }
+
 }

DuckDuckGo/PrivacyProtection.storyboard

@@ -350,6 +350,9 @@
                                                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f83-AN-wMW">
                                                             <rect key="frame" x="278" y="0.0" width="51" height="31"/>
                                                             <color key="onTintColor" red="0.086274509803921567" green="0.32941176470588235" blue="0.086274509803921567" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <connections>
+                                                                <action selector="toggleProtection" destination="7Z1-eg-OWQ" eventType="valueChanged" id="Qnb-IB-9wQ"/>
+                                                            </connections>
                                                         </switch>
                                                     </subviews>
                                                 </stackView>
@@ -370,7 +373,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TRACKER NETWORK LEADERBOARD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hB8-nL-nri">
-                                                    <rect key="frame" x="84" y="22" width="209" height="14"/>
+                                                    <rect key="frame" x="83.5" y="22" width="209" height="14"/>
                                                     <fontDescription key="fontDescription" name="ProximaNova-Bold" family="Proxima Nova" pointSize="12"/>
                                                     <color key="textColor" red="0.57647058823529407" green="0.57647058823529407" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>

DuckDuckGo/PrivacyProtectionOverviewController.swift

@@ -45,6 +45,10 @@ class PrivacyProtectionOverviewController: UITableViewController {
         }
     }
 
+    @IBAction func toggleProtection() {
+        contentBlocker.enabled = privacyProtectionSwitch.isOn
+    }
+
     func updateSiteRating(_ siteRating: SiteRating) {
         self.siteRating = siteRating
 
@@ -64,32 +68,38 @@ class PrivacyProtectionOverviewController: UITableViewController {
     private func updateEncryption() {
         encryptionCell.summaryLabel.text = siteRating.https ?
             UserText.privacyProtectionEncryptedConnection : UserText.privacyProtectionUnencryptedConnection
-        encryptionCell.summaryImage.image = blocking() ? #imageLiteral(resourceName: "PP Hero OFF- Connection") : #imageLiteral(resourceName: "PP Hero ON- Connection")
+        encryptionCell.summaryImage.image = protecting() ? #imageLiteral(resourceName: "PP Hero ON- Connection") : #imageLiteral(resourceName: "PP Hero OFF- Connection")
     }
 
     private func updateTrackersBlocked() {
-        trackersCell.summaryImage.image = blocking() ? #imageLiteral(resourceName: "PP Hero OFF- Networks Blocked") : #imageLiteral(resourceName: "PP Hero ON- Networks Blocked")
+        trackersCell.summaryImage.image = protecting() ? #imageLiteral(resourceName: "PP Hero ON- Networks Blocked") : #imageLiteral(resourceName: "PP Hero OFF- Networks Blocked")
+        trackersCell.summaryLabel.text = protecting() ?
+            String(format: UserText.privacyProtectionTrackersBlocked, siteRating.uniqueTrackersBlocked) :
+            String(format: UserText.privacyProtectionTrackersFound, siteRating.uniqueTrackersDetected)
     }
 
     private func updateMajorTrackersBlocked() {
-        majorTrackersCell.summaryImage.image = blocking() ? #imageLiteral(resourceName: "PP Hero OFF- Major Networks") : #imageLiteral(resourceName: "PP Hero ON- Major Networks")
+        majorTrackersCell.summaryImage.image = protecting() ? #imageLiteral(resourceName: "PP Hero ON- Major Networks") : #imageLiteral(resourceName: "PP Hero OFF- Major Networks")
+        majorTrackersCell.summaryLabel.text = protecting() ?
+            String(format: UserText.privacyProtectionMajorTrackersBlocked, siteRating.majorTrackersBlocked) :
+            String(format: UserText.privacyProtectionMajorTrackersFound, siteRating.majorTrackersDetected)
     }
 
     private func updatePrivacyPractices() {
-        privacyPracticesCell.summaryImage.image = blocking() ? #imageLiteral(resourceName: "PP Hero OFF- Good Privacy") : #imageLiteral(resourceName: "PP Hero ON- Good Privacy")
+        privacyPracticesCell.summaryImage.image = protecting() ? #imageLiteral(resourceName: "PP Hero ON- Good Privacy") : #imageLiteral(resourceName: "PP Hero OFF- Good Privacy")
     }
 
     private func updateLeaderBoard() {
         leaderboard.isHidden = true
     }
 
     private func updateProtectionToggle() {
-        privacyProtectionSwitch.isOn = !blocking()
-        privacyProtectionCell.backgroundColor = blocking() ? UIColor.coolGray : UIColor.green
+        privacyProtectionSwitch.isOn = protecting()
+        privacyProtectionCell.backgroundColor = protecting() ? UIColor.ppGreen : UIColor.ppGray
     }
 
-    private func blocking() -> Bool {
-        return !contentBlocker.enabled || contentBlocker.domainWhitelist.contains(siteRating.domain)
+    private func protecting() -> Bool {
+        return contentBlocker.enabled && !contentBlocker.domainWhitelist.contains(siteRating.domain)
     }
 
     // see https://stackoverflow.com/a/41248703
@@ -130,7 +140,7 @@ class PrivacyGradeCell: UITableViewCell {
     @IBOutlet weak var protectionDisabledLabel: UILabel!
     @IBOutlet weak var protectionUpgraded: ProtectionUpgradedView!
 
-    func update(with siteRating: SiteRating, and contentBlocking: ContentBlockerConfigurationStore) {
+    func update(with siteRating: SiteRating, and contentprotecting: ContentBlockerConfigurationStore) {
 
         if siteRating.finishedLoading {
             gradeImage.image = PrivacyGradeCell.grades[siteRating.siteGrade]
@@ -142,9 +152,9 @@ class PrivacyGradeCell: UITableViewCell {
         protectionDisabledLabel.isHidden = true
         protectionUpgraded.isHidden = true
 
-        if !contentBlocking.enabled {
+        if !contentprotecting.enabled {
             protectionDisabledLabel.isHidden = false
-        } else if contentBlocking.domainWhitelist.contains(siteRating.domain) {
+        } else if contentprotecting.domainWhitelist.contains(siteRating.domain) {
             protectionPausedLabel.isHidden = false
         } else {
             // TODO show upgrade
@@ -212,4 +222,15 @@ fileprivate class InteractivePopRecognizer: NSObject, UIGestureRecognizerDelegat
     }
 }
 
+fileprivate extension UIColor {
+
+    fileprivate static var ppGray: UIColor {
+        return UIColor(red: 149.0 / 255.0, green: 149.0 / 255.0, blue: 149.0 / 255.0, alpha: 1.0)
+    }
+
+    fileprivate static var ppGreen: UIColor {
+        return UIColor(red: 63.0 / 255.0, green: 161.0 / 255.0, blue: 64.0 / 255.0, alpha: 1.0)
+    }
+
+}
 

DuckDuckGo/UserText.swift

@@ -69,6 +69,10 @@ public struct UserText {
 
     public static let privacyProtectionEncryptedConnection = NSLocalizedString("privacy.protection.encrypted.connection", comment: "Encrypted conection")
     public static let privacyProtectionUnencryptedConnection = NSLocalizedString("privacy.protection.unencrypted.connection", comment: "Unencrypted conection")
+    public static let privacyProtectionTrackersBlocked = NSLocalizedString("privacy.protection.trackers.blocked", comment: "Trackers blocked")
+    public static let privacyProtectionTrackersFound = NSLocalizedString("privacy.protection.trackers.found", comment: "Trackers found")
+    public static let privacyProtectionMajorTrackersBlocked = NSLocalizedString("privacy.protection.major.trackers.blocked", comment: "Major trackers blocked")
+    public static let privacyProtectionMajorTrackersFound = NSLocalizedString("privacy.protection.major.trackers.found", comment: "Major trackers found")
 
     public static func forSiteGrade(_ grade: SiteGrade) -> String {
         let key = "monitoring.sitegrade.\(grade.rawValue)"

DuckDuckGo/en.lproj/Localizable.strings

@@ -64,3 +64,10 @@
 "monitoring.sitegrade.b" = "B";
 "monitoring.sitegrade.c" = "C";
 "monitoring.sitegrade.d" = "D";
+
+"privacy.protection.encrypted.connection" = "Encrypted Connection";
+"privacy.protection.unencrypted.connection" = "Unencrypted Connection";
+"privacy.protection.trackers.blocked" = "%d Tracker Networks Blocked";
+"privacy.protection.trackers.found" = "%d Tracker Networks Found";
+"privacy.protection.major.trackers.blocked" = "%d Major Tracker Networks Blocked";
+"privacy.protection.major.trackers.found" = "%d Major Tracker Networks Found";