Update Privacy Dashboard design - fix #758 (#765)

Author: Krzysztof Jan Modras

UserAgent/Views/Privacy Indicator/PrivacyDashboardUtils.swift

@@ -18,13 +18,10 @@ enum PrivacyDashboardUtils {
         private func columns(dot: UIView, label: UILabel, number: UILabel) {
             self.spacing = 5
             self.alignment = .top
-            self.distribution = .fill
+            self.distribution = .fillProportionally
             [dot, label, number].forEach { self.addArrangedSubview($0) }
             number.alpha = 0.7
-
-            label.snp.makeConstraints { make in
-                make.width.lessThanOrEqualTo(100)
-            }
+            number.textAlignment = .right
             number.snp.makeConstraints { make in
                 // space for keeping three digits [18, 25]
                 make.width.greaterThanOrEqualTo(18)
@@ -61,9 +58,9 @@ enum PrivacyDashboardUtils {
         }
         private func setupForStat() {
             self.textColor = Theme.textField.textAndTint
-            self.numberOfLines = 0
+            self.numberOfLines = 2
+            self.lineBreakMode = .byWordWrapping
             self.setContentCompressionResistancePriority(.required, for: .horizontal)
-            self.font = UIFont.preferredFont(forTextStyle: .footnote)
         }
         private func setupForDomain() {
             self.textColor = UIColor.DarkGreen

UserAgent/Views/Privacy Indicator/PrivacyDashboardView.swift

@@ -8,9 +8,7 @@ class PrivacyDashboardView: UIView, PhotonCustomViewCellContent {
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.snp.makeConstraints { make in
-            // This fixes a bug
-            // where the tableview would squash elements inside PrivacyDashboardView
-            make.height.greaterThanOrEqualTo(UIScreen.main.bounds.height * 0.3)
+            make.height.greaterThanOrEqualTo(0)
         }
         self.backgroundColor = UIColor.clear
     }

UserAgent/Views/Privacy Indicator/PrivacyIndicatorView.swift

@@ -14,10 +14,11 @@ enum PrivacyIndicatorTransformation {
             let color = UIColor(named: "PrivacyIndicatorBackground")!
             return (arcs: [(color, 1)], strike: (color, 1))
         }
-        let arcs: [(UIColor, Int)] = WTMCategory.statsDict(from: stats)
-            .map { (key, value) in (key.color, value) }
+        let arcsWithKeys: [(UIColor, Int, WTMCategory)] = WTMCategory.statsDict(from: stats)
+            .map { (key, value) in (key.color, value, key) }
             .filter { $0.1 != 0 }
-            .sorted(by: { $1.1 < $0.1 })
+            .sorted(by: { String(describing: $1.2) < String(describing: $0.2) })
+        let arcs: [(UIColor, Int)] = arcsWithKeys.map { (color, value, key) in (color, value) }
         return (arcs: arcs, strike: nil)
     }
 }

Widgets/PrivacyIndicator/Canvas.swift

@@ -89,7 +89,7 @@ fileprivate extension PrivacyIndicator.CanvasView {
         let maxX = self.bounds.maxX
         let maxY = self.bounds.maxY
         let radius = width * 3 / 8
-        let diagonal = sqrt(3 * width * width)
+        let diagonal = sqrt(2 * width * width)
         let distance = (diagonal / 2) - radius
         let vDistance = sqrt((distance * distance) / 2)