From 63aa8c2f4488b99ec23d1cee2ed610d6b2209f3f Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Tue, 7 Dec 2021 19:16:47 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Information=20density,=20open=20?=
 =?UTF-8?q?URL=20on=20double=20click=20(#65)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PHP Monitor.xcodeproj/project.pbxproj         |  2 +-
 .../Lock.imageset/Contents.json               |  2 +-
 .../Assets.xcassets/Lock.imageset/Locked.svg  | 10 +++++
 phpmon/Assets.xcassets/Lock.imageset/lock.svg |  1 -
 .../LockUnlocked.imageset/Contents.json       | 24 +++++++++++
 .../LockUnlocked.imageset/Unlocked.svg        | 10 +++++
 phpmon/Domain/Core/Base.lproj/Main.storyboard | 41 +++++++++----------
 phpmon/Domain/PHP/PhpInstallation.swift       | 17 +-------
 phpmon/Domain/SiteList/SiteListCell.swift     |  4 +-
 phpmon/Domain/SiteList/SiteListVC.swift       |  9 ++++
 10 files changed, 77 insertions(+), 43 deletions(-)
 create mode 100644 phpmon/Assets.xcassets/Lock.imageset/Locked.svg
 delete mode 100644 phpmon/Assets.xcassets/Lock.imageset/lock.svg
 create mode 100644 phpmon/Assets.xcassets/LockUnlocked.imageset/Contents.json
 create mode 100644 phpmon/Assets.xcassets/LockUnlocked.imageset/Unlocked.svg

diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
index 9481b8d..b80917b 100644
--- a/PHP Monitor.xcodeproj/project.pbxproj	
+++ b/PHP Monitor.xcodeproj/project.pbxproj	
@@ -357,10 +357,10 @@
 		C4B13B1D25C4915000548C3A /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
 				C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */,
 				C4B97B74275CF08C003F3378 /* AppDelegate+MenuOutlets.swift */,
 				C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */,
-				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
 				C4811D2322D70A4700B5F6B3 /* App.swift */,
 				C4B97B77275CF1B5003F3378 /* App+ActivationPolicy.swift */,
 				C4B97B7A275CF20A003F3378 /* App+GlobalHotkey.swift */,
diff --git a/phpmon/Assets.xcassets/Lock.imageset/Contents.json b/phpmon/Assets.xcassets/Lock.imageset/Contents.json
index 9069859..d874efc 100644
--- a/phpmon/Assets.xcassets/Lock.imageset/Contents.json
+++ b/phpmon/Assets.xcassets/Lock.imageset/Contents.json
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "lock.svg",
+      "filename" : "Locked.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/phpmon/Assets.xcassets/Lock.imageset/Locked.svg b/phpmon/Assets.xcassets/Lock.imageset/Locked.svg
new file mode 100644
index 0000000..60564f5
--- /dev/null
+++ b/phpmon/Assets.xcassets/Lock.imageset/Locked.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect id="Locked" x="0" y="0" width="30" height="30" style="fill:none;"/>
+    <g id="Locked1" serif:id="Locked">
+        <g transform="matrix(0.0468317,0,0,0.0468317,4.50971,3.01112)">
+            <path d="M400,256L152,256L152,152.9C152,113.3 183.7,80.4 223.3,80C263.3,79.6 296,112.1 296,152L296,266.079C296,279.379 376,279.137 376,265.837L376,152C376,68 307.5,-0.3 223.5,0C139.5,0.3 72,69.5 72,153.5L72,256L48,256C21.5,256 0,277.5 0,304L0,464C0,490.5 21.5,512 48,512L400,512C426.5,512 448,490.5 448,464L448,304C448,277.5 426.5,256 400,256Z" style="fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/phpmon/Assets.xcassets/Lock.imageset/lock.svg b/phpmon/Assets.xcassets/Lock.imageset/lock.svg
deleted file mode 100644
index 86a172a..0000000
--- a/phpmon/Assets.xcassets/Lock.imageset/lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z"/></svg>
\ No newline at end of file
diff --git a/phpmon/Assets.xcassets/LockUnlocked.imageset/Contents.json b/phpmon/Assets.xcassets/LockUnlocked.imageset/Contents.json
new file mode 100644
index 0000000..956848a
--- /dev/null
+++ b/phpmon/Assets.xcassets/LockUnlocked.imageset/Contents.json
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Unlocked.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/phpmon/Assets.xcassets/LockUnlocked.imageset/Unlocked.svg b/phpmon/Assets.xcassets/LockUnlocked.imageset/Unlocked.svg
new file mode 100644
index 0000000..69e0af7
--- /dev/null
+++ b/phpmon/Assets.xcassets/LockUnlocked.imageset/Unlocked.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <rect id="Locked" x="0" y="0" width="30" height="30" style="fill:none;"/>
+    <g id="Locked1" serif:id="Locked">
+        <g transform="matrix(0.0468317,0,0,0.0468317,4.50971,3.01112)">
+            <path d="M400,256L152,256L152,152.9C152,113.3 183.7,80.4 223.3,80C263.3,79.6 296,112.1 296,152L296,168C296,181.3 322.386,192 322.386,192L352,192C365.3,192 376,181.3 376,168L376,152C376,68 307.5,-0.3 223.5,0C139.5,0.3 72,69.5 72,153.5L72,256L48,256C21.5,256 0,277.5 0,304L0,464C0,490.5 21.5,512 48,512L400,512C426.5,512 448,490.5 448,464L448,304C448,277.5 426.5,256 400,256Z" style="fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/phpmon/Domain/Core/Base.lproj/Main.storyboard b/phpmon/Domain/Core/Base.lproj/Main.storyboard
index 9696d70..3eaea91 100644
--- a/phpmon/Domain/Core/Base.lproj/Main.storyboard
+++ b/phpmon/Domain/Core/Base.lproj/Main.storyboard
@@ -614,7 +614,7 @@ Gw
             <objects>
                 <viewController storyboardIdentifier="siteList" id="JZI-Vd-9oq" customClass="SiteListVC" customModule="PHP_Monitor" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" misplaced="YES" id="rIZ-4U-bhj">
-                        <rect key="frame" x="0.0" y="0.0" width="550" height="320"/>
+                        <rect key="frame" x="0.0" y="0.0" width="550" height="309"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="54" horizontalPageScroll="10" verticalLineScroll="54" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p0j-eB-I2i">
@@ -647,7 +647,7 @@ Gw
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="XJL-Uw-frD">
-                                                                    <rect key="frame" x="46" y="28" width="145" height="16"/>
+                                                                    <rect key="frame" x="38" y="26" width="145" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="my-domain-name.test" id="SGC-Gm-Mxd">
                                                                         <font key="font" metaFont="systemSemibold" size="13"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -655,26 +655,23 @@ Gw
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="CXK-Q9-CpO">
-                                                                    <rect key="frame" x="46" y="14" width="75" height="14"/>
+                                                                    <rect key="frame" x="38" y="12" width="75" height="14"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="~/path/to/site" id="fe7-Ha-mR9">
-                                                                        <font key="font" metaFont="system" size="11"/>
-                                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                        <font key="font" metaFont="smallSystem"/>
+                                                                        <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QPX-eu-eV8">
-                                                                    <rect key="frame" x="17" y="25" width="16" height="16"/>
+                                                                    <rect key="frame" x="10" y="22" width="20" height="20"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="width" constant="16" id="Bmk-CN-Yyn"/>
-                                                                        <constraint firstAttribute="height" constant="16" id="d4z-lb-Ww0"/>
+                                                                        <constraint firstAttribute="width" constant="20" id="Bmk-CN-Yyn"/>
+                                                                        <constraint firstAttribute="height" constant="20" id="d4z-lb-Ww0"/>
                                                                     </constraints>
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Lock" id="aJ0-ia-YrZ"/>
                                                                 </imageView>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-Ls-7FZ">
-                                                                    <rect key="frame" x="444" y="27" width="79" height="11"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="75" id="RuE-IX-D3c"/>
-                                                                    </constraints>
+                                                                    <rect key="frame" x="459" y="28" width="64" height="11"/>
                                                                     <textFieldCell key="cell" lineBreakMode="clipping" title="DRIVER TYPE" id="fjd-eb-itv">
                                                                         <font key="font" metaFont="miniSystem"/>
                                                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -682,9 +679,9 @@ Gw
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TbX-e2-3QL">
-                                                                    <rect key="frame" x="444" y="14" width="36" height="14"/>
+                                                                    <rect key="frame" x="459" y="15" width="36" height="14"/>
                                                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Driver" id="GMt-SG-vFl">
-                                                                        <font key="font" metaFont="system" size="11"/>
+                                                                        <font key="font" metaFont="smallSystem"/>
                                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
@@ -693,7 +690,7 @@ Gw
                                                                     <rect key="frame" x="0.0" y="-2" width="531" height="5"/>
                                                                 </box>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0NQ-ZD-CqD">
-                                                                    <rect key="frame" x="420" y="18" width="18" height="18"/>
+                                                                    <rect key="frame" x="435" y="18" width="18" height="18"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="18" id="Suw-gm-AEi"/>
                                                                         <constraint firstAttribute="height" constant="18" id="qO6-vg-5nC"/>
@@ -704,18 +701,18 @@ Gw
                                                             </subviews>
                                                             <constraints>
                                                                 <constraint firstItem="TbX-e2-3QL" firstAttribute="leading" secondItem="0NQ-ZD-CqD" secondAttribute="trailing" constant="8" symbolic="YES" id="4cb-D9-8d1"/>
-                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="leading" secondItem="QPX-eu-eV8" secondAttribute="trailing" constant="15" id="55y-3V-RYt"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="leading" secondItem="QPX-eu-eV8" secondAttribute="trailing" constant="10" id="55y-3V-RYt"/>
                                                                 <constraint firstItem="syz-LF-l6P" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" id="8QK-nf-Fiw"/>
-                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="top" constant="3" id="9QB-jZ-k1V"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="top" id="9QB-jZ-k1V"/>
+                                                                <constraint firstItem="QPX-eu-eV8" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" constant="10" id="GOj-sw-ZlZ"/>
                                                                 <constraint firstItem="TbX-e2-3QL" firstAttribute="top" secondItem="jKi-Ls-7FZ" secondAttribute="bottom" constant="-1" id="J29-wT-Uex"/>
-                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="leading" secondItem="5GY-nN-BWd" secondAttribute="leading" constant="48" id="Kns-wj-vAJ"/>
                                                                 <constraint firstItem="CXK-Q9-CpO" firstAttribute="leading" secondItem="XJL-Uw-frD" secondAttribute="leading" id="Ojw-VZ-3EG"/>
                                                                 <constraint firstAttribute="trailing" secondItem="syz-LF-l6P" secondAttribute="trailing" id="PWd-5k-AlD"/>
-                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="top" secondItem="5GY-nN-BWd" secondAttribute="top" constant="10" id="QeE-c7-I9U"/>
+                                                                <constraint firstItem="XJL-Uw-frD" firstAttribute="top" secondItem="5GY-nN-BWd" secondAttribute="top" constant="12" id="QeE-c7-I9U"/>
                                                                 <constraint firstAttribute="trailing" secondItem="jKi-Ls-7FZ" secondAttribute="trailing" constant="10" id="Uhk-Dy-c65"/>
                                                                 <constraint firstItem="0NQ-ZD-CqD" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" id="Utr-aa-tqX"/>
                                                                 <constraint firstItem="CXK-Q9-CpO" firstAttribute="top" secondItem="XJL-Uw-frD" secondAttribute="bottom" id="VKg-Vq-sYa"/>
-                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" constant="6" id="cN8-zO-fnc"/>
+                                                                <constraint firstItem="TbX-e2-3QL" firstAttribute="centerY" secondItem="5GY-nN-BWd" secondAttribute="centerY" constant="5" id="cN8-zO-fnc"/>
                                                                 <constraint firstAttribute="bottom" secondItem="syz-LF-l6P" secondAttribute="bottom" id="gj7-cJ-Lle"/>
                                                                 <constraint firstItem="jKi-Ls-7FZ" firstAttribute="leading" secondItem="TbX-e2-3QL" secondAttribute="leading" id="zjN-s3-2Ww"/>
                                                             </constraints>
@@ -742,7 +739,7 @@ Gw
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="550" id="iRQ-sz-oyv"/>
                                 </constraints>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="TDE-ff-DQT">
-                                    <rect key="frame" x="1" y="295" width="548" height="15"/>
+                                    <rect key="frame" x="1" y="293" width="548" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="wFn-93-f10">
@@ -779,7 +776,7 @@ Gw
     </scenes>
     <resources>
         <image name="IconLinked" width="512" height="512"/>
-        <image name="Lock" width="448" height="512"/>
+        <image name="Lock" width="30" height="30"/>
         <image name="arrow.clockwise" catalog="system" width="14" height="16"/>
     </resources>
 </document>
diff --git a/phpmon/Domain/PHP/PhpInstallation.swift b/phpmon/Domain/PHP/PhpInstallation.swift
index 99f3fa6..02577e2 100644
--- a/phpmon/Domain/PHP/PhpInstallation.swift
+++ b/phpmon/Domain/PHP/PhpInstallation.swift
@@ -11,12 +11,10 @@ import Foundation
 class PhpInstallation {
     
     var longVersion: String
-    var homebrewInfo: HomebrewPackage?
     
     /**
      In order to determine details about a PHP installation, we’ll simply run `php-config --version`
-     in the relevant directory, and we’ll also attempt to determine information about the Homebrew
-     formula for that particular installation.
+     in the relevant directory.
      */
     init(_ version: String) {
         let phpConfigExecutablePath = "\(Paths.optPath)/php@\(version)/bin/php-config"
@@ -27,19 +25,6 @@ class PhpInstallation {
                 arguments: ["--version"]
             )
         }
-        
-        let info = Shell.pipe("\(Paths.brew) info php@\(version) --json")
-        
-        do {
-            self.homebrewInfo = try JSONDecoder().decode(
-                [HomebrewPackage].self,
-                from: info.data(using: .utf8)!
-            ).first ?? nil
-        } catch {
-            // TODO: Perhaps show a modal to indicate there’s an issue with Homebrew?
-            print("There was an issue parsing Homebrew info for PHP \(version)")
-            self.homebrewInfo = nil
-        }
     }
     
 }
diff --git a/phpmon/Domain/SiteList/SiteListCell.swift b/phpmon/Domain/SiteList/SiteListCell.swift
index 91efeb4..a2990e9 100644
--- a/phpmon/Domain/SiteList/SiteListCell.swift
+++ b/phpmon/Domain/SiteList/SiteListCell.swift
@@ -40,8 +40,8 @@ class SiteListCell: NSTableCellView
         imageViewType.contentTintColor = NSColor.tertiaryLabelColor
         
         // Show the green or red lock based on whether the site was secured
-        imageViewLock.contentTintColor = site.secured ? NSColor.systemGreen
-        : NSColor.red
+        imageViewLock.image = NSImage(named: site.secured ? "Lock" : "LockUnlocked")
+        imageViewLock.contentTintColor = site.secured ? NSColor.systemGreen : NSColor.systemRed
         
         // Show the current driver
         labelDriver.stringValue = site.driver ?? "???"
diff --git a/phpmon/Domain/SiteList/SiteListVC.swift b/phpmon/Domain/SiteList/SiteListVC.swift
index 35ebd05..bc907dc 100644
--- a/phpmon/Domain/SiteList/SiteListVC.swift
+++ b/phpmon/Domain/SiteList/SiteListVC.swift
@@ -70,6 +70,7 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource {
     // MARK: - Lifecycle
     
     override func viewDidLoad() {
+        tableView.doubleAction = #selector(self.doubleClicked(sender:))
         sites = Valet.shared.sites
         setUINotBusy()
     }
@@ -147,6 +148,14 @@ class SiteListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource {
         reloadContextMenu()
     }
     
+    @objc func doubleClicked(sender: Any) {
+        guard self.selectedSite != nil else {
+            return
+        }
+        
+        self.openInBrowser()
+    }
+    
     // MARK: Secure & Unsecure
     
     @objc public func toggleSecure() {