From 9ad64e1b153ea9fb79e464d63b386f753ec5e383 Mon Sep 17 00:00:00 2001
From: Oleg Dreyman <dreymonde@me.com>
Date: Mon, 28 Sep 2020 19:58:23 +0300
Subject: [PATCH 1/2] feat: Block Log page now shows number of blocks today

---
 LockdowniOS/Base.lproj/Main.storyboard   | 43 +++++++++++++++++-------
 LockdowniOS/BlockLogViewController.swift |  4 +++
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/LockdowniOS/Base.lproj/Main.storyboard b/LockdowniOS/Base.lproj/Main.storyboard
index de86684..e1e6c5f 100644
--- a/LockdowniOS/Base.lproj/Main.storyboard
+++ b/LockdowniOS/Base.lproj/Main.storyboard
@@ -72,7 +72,7 @@
                                 </constraints>
                             </stackView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="I2D-RD-nwm">
-                                <rect key="frame" x="0.0" y="142.5" width="320" height="405.5"/>
+                                <rect key="frame" x="0.0" y="167" width="320" height="381"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="detailButton" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="blockLogCell" rowHeight="36" id="7rY-DO-9Xs" customClass="BlockLogCell" customModule="Lockdown" customModuleProvider="target">
@@ -172,21 +172,37 @@
                                     <action selector="showMenu" destination="H7Z-IH-L96" eventType="touchUpInside" id="9Fp-gS-kZQ"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3421" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sar-GU-wUS">
+                                <rect key="frame" x="128.5" y="137" width="44.5" height="23.5"/>
+                                <fontDescription key="fontDescription" name="Montserrat-Bold" family="Montserrat" pointSize="20"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Blocked today:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oYx-Wf-i0q">
+                                <rect key="frame" x="19" y="140.5" width="94.5" height="16.5"/>
+                                <fontDescription key="fontDescription" name="Montserrat-Medium" family="Montserrat" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="I2D-RD-nwm" secondAttribute="bottom" id="20g-cP-vsH"/>
                             <constraint firstAttribute="trailing" secondItem="I2D-RD-nwm" secondAttribute="trailing" id="5od-ga-vzZ"/>
-                            <constraint firstItem="I2D-RD-nwm" firstAttribute="top" secondItem="ccb-xf-LSM" secondAttribute="bottom" constant="10" id="EUt-ey-VqF"/>
                             <constraint firstItem="Wi8-F0-ahr" firstAttribute="trailing" secondItem="Nuo-UQ-uqm" secondAttribute="trailingMargin" id="Gyn-Sd-PxA"/>
                             <constraint firstItem="I2D-RD-nwm" firstAttribute="leading" secondItem="Nuo-UQ-uqm" secondAttribute="leading" id="OL6-Qp-XoY"/>
                             <constraint firstItem="ccb-xf-LSM" firstAttribute="top" secondItem="Wi8-F0-ahr" secondAttribute="bottom" constant="7" id="SEC-OP-BuN"/>
+                            <constraint firstItem="oYx-Wf-i0q" firstAttribute="bottom" secondItem="I2D-RD-nwm" secondAttribute="top" constant="-10" id="VFa-FS-Txr"/>
+                            <constraint firstItem="oYx-Wf-i0q" firstAttribute="top" secondItem="ccb-xf-LSM" secondAttribute="bottom" constant="8" id="Ws1-uS-jlm"/>
                             <constraint firstItem="OIa-zY-ALo" firstAttribute="centerY" secondItem="fmE-6E-gnc" secondAttribute="centerY" id="XOz-QY-taa"/>
                             <constraint firstItem="hio-Xi-kNY" firstAttribute="leading" secondItem="Nuo-UQ-uqm" secondAttribute="leading" constant="32" id="YFE-xy-uZz"/>
                             <constraint firstItem="fmE-6E-gnc" firstAttribute="centerX" secondItem="Nuo-UQ-uqm" secondAttribute="centerX" id="ZK1-3w-lO2"/>
+                            <constraint firstItem="Sar-GU-wUS" firstAttribute="leading" secondItem="oYx-Wf-i0q" secondAttribute="trailing" constant="15" id="eLx-No-Y1g"/>
+                            <constraint firstItem="oYx-Wf-i0q" firstAttribute="leading" secondItem="ccb-xf-LSM" secondAttribute="leading" id="fwc-DZ-pPp"/>
                             <constraint firstItem="ccb-xf-LSM" firstAttribute="centerX" secondItem="Nuo-UQ-uqm" secondAttribute="centerX" id="gDp-vk-gtw"/>
                             <constraint firstAttribute="trailing" secondItem="hio-Xi-kNY" secondAttribute="trailing" constant="32" id="jkv-0T-QRc"/>
                             <constraint firstItem="ccb-xf-LSM" firstAttribute="leading" secondItem="Nuo-UQ-uqm" secondAttribute="leading" constant="19" id="n67-gK-uYo"/>
+                            <constraint firstItem="Sar-GU-wUS" firstAttribute="centerY" secondItem="oYx-Wf-i0q" secondAttribute="centerY" id="oyF-53-6dL"/>
                             <constraint firstAttribute="trailing" secondItem="ccb-xf-LSM" secondAttribute="trailing" constant="19" id="s76-Qt-iIc"/>
                             <constraint firstItem="Wi8-F0-ahr" firstAttribute="centerY" secondItem="fmE-6E-gnc" secondAttribute="centerY" id="tRU-XS-yj7"/>
                             <constraint firstItem="hio-Xi-kNY" firstAttribute="centerY" secondItem="Nuo-UQ-uqm" secondAttribute="centerY" id="tbJ-Ri-cno"/>
@@ -195,6 +211,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="blockDayCounterLabel" destination="Sar-GU-wUS" id="NLg-g4-69O"/>
                         <outlet property="blockLogDisabledContainer" destination="hio-Xi-kNY" id="hhM-ab-Cs1"/>
                         <outlet property="tableView" destination="I2D-RD-nwm" id="NC6-Yy-zzd"/>
                     </connections>
@@ -1338,7 +1355,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="CQN-ao-cuu">
-                                <rect key="frame" x="0.0" y="54" width="320" height="50"/>
+                                <rect key="frame" x="0.0" y="54" width="320" height="48"/>
                                 <subviews>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PO4-d5-rZJ">
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="8"/>
@@ -1359,10 +1376,10 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SRb-dA-tWF">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Blocking Enabled" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kd7-nB-tAb">
-                                                <rect key="frame" x="20" y="6.5" width="144" height="30"/>
+                                                <rect key="frame" x="20" y="5.5" width="144" height="30"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="30" id="ZgL-en-Q3V"/>
                                                 </constraints>
@@ -1370,14 +1387,14 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MMI-Pp-XI4">
-                                                <rect key="frame" x="251" y="5" width="51" height="33"/>
+                                                <rect key="frame" x="251" y="5" width="51" height="31"/>
                                                 <color key="onTintColor" red="0.0" green="0.67751116069999995" blue="0.90461090690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <connections>
                                                     <action selector="toggleLockdownWithSender:" destination="lbX-da-1v3" eventType="valueChanged" id="5KZ-iG-w1a"/>
                                                 </connections>
                                             </switch>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pH0-q3-pY2">
-                                                <rect key="frame" x="0.0" y="49" width="320" height="1"/>
+                                                <rect key="frame" x="0.0" y="47" width="320" height="1"/>
                                                 <color key="backgroundColor" systemColor="separatorColor"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="1" id="cle-g9-fSo"/>
@@ -1400,7 +1417,7 @@
                                 </subviews>
                             </stackView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="45" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="Gjd-0I-N7k">
-                                <rect key="frame" x="0.0" y="104" width="320" height="444"/>
+                                <rect key="frame" x="0.0" y="102" width="320" height="446"/>
                                 <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="BlockListGroupCell" rowHeight="72" id="c8H-rF-8EP" customClass="BlockListGroupCell" customModule="Lockdown" customModuleProvider="target">
@@ -3206,18 +3223,18 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email Address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wPU-g5-s3s">
-                                <rect key="frame" x="24" y="176" width="272" height="34"/>
+                                <rect key="frame" x="24" y="175" width="272" height="34"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES" textContentType="username"/>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jMa-F3-KUG">
-                                <rect key="frame" x="24" y="158" width="34.5" height="15"/>
+                                <rect key="frame" x="24" y="158" width="29.5" height="14"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="12"/>
                                 <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="f3K-Kz-eVg">
-                                <rect key="frame" x="24" y="236" width="272" height="34"/>
+                                <rect key="frame" x="24" y="234" width="272" height="34"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="go" enablesReturnKeyAutomatically="YES" secureTextEntry="YES" textContentType="password"/>
                                 <connections>
@@ -3225,7 +3242,7 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3y-bX-UkA">
-                                <rect key="frame" x="24" y="218" width="58" height="15"/>
+                                <rect key="frame" x="24" y="217" width="53.5" height="14"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="12"/>
                                 <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
@@ -3240,7 +3257,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gJW-8m-Vk5">
-                                <rect key="frame" x="24" y="276" width="272" height="43"/>
+                                <rect key="frame" x="24" y="274" width="272" height="43"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="43" id="bVg-3M-sga"/>
                                 </constraints>
diff --git a/LockdowniOS/BlockLogViewController.swift b/LockdowniOS/BlockLogViewController.swift
index f177180..18f3f9c 100644
--- a/LockdowniOS/BlockLogViewController.swift
+++ b/LockdowniOS/BlockLogViewController.swift
@@ -9,6 +9,8 @@ import UIKit
 
 class BlockLogViewController: BaseViewController, UITableViewDelegate, UITableViewDataSource {
     
+    @IBOutlet var blockDayCounterLabel: UILabel!
+    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return dayLogTime.count;
     }
@@ -39,6 +41,7 @@ class BlockLogViewController: BaseViewController, UITableViewDelegate, UITableVi
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        blockDayCounterLabel.text = getDayMetricsString()
         tableView.refreshControl = refreshControl
         refreshControl.addTarget(self, action: #selector(self.refreshData(_:)), for: .valueChanged);
         
@@ -46,6 +49,7 @@ class BlockLogViewController: BaseViewController, UITableViewDelegate, UITableVi
     }
     
     @objc func refreshData(_ sender: Any) {
+        blockDayCounterLabel.text = getDayMetricsString()
         if BlockDayLog.shared.isEnabled {
             tableView.isHidden = false
             blockLogDisabledContainer.isHidden = true

From f555ebd233812fee4db6765185b3446118685585 Mon Sep 17 00:00:00 2001
From: Johnny Lin <johnny@lockdownhq.com>
Date: Mon, 28 Sep 2020 16:58:55 -0700
Subject: [PATCH 2/2] UI: Use commas for metric for easier readability

---
 LockdownFirewallWidget/Info.plist        |  2 +-
 LockdowniOS.xcodeproj/project.pbxproj    |  2 ++
 LockdowniOS/Base.lproj/Main.storyboard   | 19 ++++++++++---------
 LockdowniOS/BlockLogViewController.swift |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/LockdownFirewallWidget/Info.plist b/LockdownFirewallWidget/Info.plist
index 8aecb6b..78cf8a0 100644
--- a/LockdownFirewallWidget/Info.plist
+++ b/LockdownFirewallWidget/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/LockdowniOS.xcodeproj/project.pbxproj b/LockdowniOS.xcodeproj/project.pbxproj
index f41ba89..1c3907b 100644
--- a/LockdowniOS.xcodeproj/project.pbxproj
+++ b/LockdowniOS.xcodeproj/project.pbxproj
@@ -2270,6 +2270,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = V8J3Z26F6Z;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = LockdownFirewallWidget/Info.plist;
@@ -2298,6 +2299,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = V8J3Z26F6Z;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = LockdownFirewallWidget/Info.plist;
diff --git a/LockdowniOS/Base.lproj/Main.storyboard b/LockdowniOS/Base.lproj/Main.storyboard
index 09872ef..801b51b 100644
--- a/LockdowniOS/Base.lproj/Main.storyboard
+++ b/LockdowniOS/Base.lproj/Main.storyboard
@@ -72,7 +72,7 @@
                                 </constraints>
                             </stackView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="I2D-RD-nwm">
-                                <rect key="frame" x="0.0" y="167" width="320" height="381"/>
+                                <rect key="frame" x="0.0" y="168" width="320" height="380"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" accessoryType="detailButton" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="blockLogCell" rowHeight="36" id="7rY-DO-9Xs" customClass="BlockLogCell" customModule="Lockdown" customModuleProvider="target">
@@ -173,13 +173,14 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3421" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sar-GU-wUS">
-                                <rect key="frame" x="128.5" y="137" width="44.5" height="23.5"/>
-                                <fontDescription key="fontDescription" name="Montserrat-Bold" family="Montserrat" pointSize="20"/>
+                                <rect key="frame" x="139" y="138.5" width="41" height="22"/>
+                                <fontDescription key="fontDescription" name="Montserrat-Bold" family="Montserrat" pointSize="18"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
+                                <size key="shadowOffset" width="0.0" height="0.0"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Blocked today:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oYx-Wf-i0q">
-                                <rect key="frame" x="19" y="140.5" width="94.5" height="16.5"/>
+                                <rect key="frame" x="19" y="140.5" width="105" height="17.5"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Medium" family="Montserrat" pointSize="14"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -3223,18 +3224,18 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email Address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wPU-g5-s3s">
-                                <rect key="frame" x="24" y="175" width="272" height="34"/>
+                                <rect key="frame" x="24" y="176" width="272" height="34"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES" textContentType="username"/>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jMa-F3-KUG">
-                                <rect key="frame" x="24" y="158" width="29.5" height="14"/>
+                                <rect key="frame" x="24" y="158" width="34.5" height="15"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="12"/>
                                 <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="f3K-Kz-eVg">
-                                <rect key="frame" x="24" y="234" width="272" height="34"/>
+                                <rect key="frame" x="24" y="236" width="272" height="34"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="go" enablesReturnKeyAutomatically="YES" secureTextEntry="YES" textContentType="password"/>
                                 <connections>
@@ -3242,7 +3243,7 @@
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3y-bX-UkA">
-                                <rect key="frame" x="24" y="217" width="53.5" height="14"/>
+                                <rect key="frame" x="24" y="218" width="58" height="15"/>
                                 <fontDescription key="fontDescription" name="Montserrat-Regular" family="Montserrat" pointSize="12"/>
                                 <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
@@ -3257,7 +3258,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gJW-8m-Vk5">
-                                <rect key="frame" x="24" y="274" width="272" height="43"/>
+                                <rect key="frame" x="24" y="276" width="272" height="43"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="43" id="bVg-3M-sga"/>
                                 </constraints>
diff --git a/LockdowniOS/BlockLogViewController.swift b/LockdowniOS/BlockLogViewController.swift
index 18f3f9c..7564951 100644
--- a/LockdowniOS/BlockLogViewController.swift
+++ b/LockdowniOS/BlockLogViewController.swift
@@ -41,7 +41,7 @@ class BlockLogViewController: BaseViewController, UITableViewDelegate, UITableVi
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        blockDayCounterLabel.text = getDayMetricsString()
+        blockDayCounterLabel.text = getDayMetricsString(commas: true)
         tableView.refreshControl = refreshControl
         refreshControl.addTarget(self, action: #selector(self.refreshData(_:)), for: .valueChanged);
         
@@ -49,7 +49,7 @@ class BlockLogViewController: BaseViewController, UITableViewDelegate, UITableVi
     }
     
     @objc func refreshData(_ sender: Any) {
-        blockDayCounterLabel.text = getDayMetricsString()
+        blockDayCounterLabel.text = getDayMetricsString(commas: true)
         if BlockDayLog.shared.isEnabled {
             tableView.isHidden = false
             blockLogDisabledContainer.isHidden = true