From 1b8d6311bad347672bceee8e61111613dd089cdb Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Tue, 12 Apr 2022 17:36:18 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20displaying=20do?= =?UTF-8?q?mains?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 12 ++-- .../IconProxy.imageset/Proxy.png | Bin 710 -> 935 bytes .../IconProxy.imageset/Proxy@2x.png | Bin 1061 -> 1479 bytes phpmon/Domain/App/Base.lproj/Main.storyboard | 10 ++-- .../Cells/DomainListCellProtocol.swift | 1 + .../DomainList/Cells/DomainListKindCell.swift | 4 ++ .../DomainList/Cells/DomainListNameCell.swift | 10 ++-- .../DomainList/Cells/DomainListPhpCell.swift | 9 +++ .../Cells/DomainListProxiesCell.swift | 37 ------------- .../DomainList/Cells/DomainListTLSCell.swift | 9 ++- .../DomainList/Cells/DomainListTypeCell.swift | 6 ++ phpmon/Domain/DomainList/DomainListVC.swift | 52 +++++++++++------- .../Nginx/NginxConfiguration.swift | 6 +- .../Integrations/Valet/DomainListable.swift | 25 +++++++++ .../Valet/Proxies/ValetProxy.swift | 28 +++++++++- .../Integrations/Valet/Sites/ValetSite.swift | 30 +++++++++- phpmon/Domain/Integrations/Valet/Valet.swift | 4 ++ phpmon/Localizable.strings | 2 +- 18 files changed, 167 insertions(+), 78 deletions(-) delete mode 100644 phpmon/Domain/DomainList/Cells/DomainListProxiesCell.swift create mode 100644 phpmon/Domain/Integrations/Valet/DomainListable.swift diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 8f191b5..7457d3b 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -51,8 +51,6 @@ C40C7F2927721FF600DDDCDC /* ActivePhpInstallation+Checks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */; }; C40C7F3027722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; }; C40C7F3127722E8D00DDDCDC /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40C7F2F27722E8D00DDDCDC /* Logger.swift */; }; - C40D88EB27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */; }; - C40D88EC27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */; }; C412E5FC25700D5300A1FB67 /* HomebrewPackage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */; }; C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; @@ -87,6 +85,8 @@ C42CFB1627DFDE7900862737 /* nginx-site.test in Resources */ = {isa = PBXBuildFile; fileRef = C42CFB1527DFDE7900862737 /* nginx-site.test */; }; C42CFB1827DFDFDC00862737 /* nginx-site-isolated.test in Resources */ = {isa = PBXBuildFile; fileRef = C42CFB1727DFDFDC00862737 /* nginx-site-isolated.test */; }; C42CFB1A27DFE8BD00862737 /* NginxConfigurationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42CFB1927DFE8BD00862737 /* NginxConfigurationTest.swift */; }; + C42F26732805B4B400938AC7 /* DomainListable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42F26722805B4B400938AC7 /* DomainListable.swift */; }; + C42F26742805B4B400938AC7 /* DomainListable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C42F26722805B4B400938AC7 /* DomainListable.swift */; }; C43603A0275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; }; C43603A1275E67610028EFC6 /* AppDelegate+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */; }; C43A8A1A25D9CD1000591B77 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43A8A1925D9CD1000591B77 /* Utility.swift */; }; @@ -284,7 +284,6 @@ C40C7F1D2772136000DDDCDC /* PhpEnv.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpEnv.swift; sourceTree = ""; }; C40C7F2727721FF600DDDCDC /* ActivePhpInstallation+Checks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ActivePhpInstallation+Checks.swift"; sourceTree = ""; }; C40C7F2F27722E8D00DDDCDC /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; - C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainListProxiesCell.swift; sourceTree = ""; }; C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackage.swift; sourceTree = ""; }; C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpFrameworks.swift; sourceTree = ""; }; C415D3B62770F294005EF286 /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = ""; }; @@ -312,6 +311,7 @@ C42CFB1527DFDE7900862737 /* nginx-site.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "nginx-site.test"; sourceTree = ""; }; C42CFB1727DFDFDC00862737 /* nginx-site-isolated.test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "nginx-site-isolated.test"; sourceTree = ""; }; C42CFB1927DFE8BD00862737 /* NginxConfigurationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NginxConfigurationTest.swift; sourceTree = ""; }; + C42F26722805B4B400938AC7 /* DomainListable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DomainListable.swift; sourceTree = ""; }; C436039F275E67610028EFC6 /* AppDelegate+Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Notifications.swift"; sourceTree = ""; }; C43A8A1925D9CD1000591B77 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = ""; }; C43A8A1F25D9D1D700591B77 /* brew-formula.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "brew-formula.json"; sourceTree = ""; }; @@ -605,7 +605,6 @@ C44067F627E258410045BD4E /* DomainListPhpCell.swift */, C44067F827E2585E0045BD4E /* DomainListTypeCell.swift */, C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */, - C40D88EA27F38D7600C94B40 /* DomainListProxiesCell.swift */, ); path = Cells; sourceTree = ""; @@ -723,6 +722,7 @@ isa = PBXGroup; children = ( C4AF9F792754499000D44ED0 /* Valet.swift */, + C42F26722805B4B400938AC7 /* DomainListable.swift */, C4C0E8D927F887BD002D32A9 /* Proxies */, C4C0E8D827F887A5002D32A9 /* Sites */, ); @@ -1100,7 +1100,6 @@ C41C02A927E61A65009F26CB /* ValetSite+Fake.swift in Sources */, C4C0E8DF27F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */, C4F2E4372752F0870020E974 /* HomebrewDiagnostics.swift in Sources */, - C40D88EB27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */, C4CCBA6C275C567B008C7055 /* PMWindowController.swift in Sources */, C4B585442770FE3900DA4FBE /* Command.swift in Sources */, C44067F527E2582B0045BD4E /* DomainListNameCell.swift in Sources */, @@ -1122,6 +1121,7 @@ C4F30B03278E16BA00755FCE /* HomebrewService.swift in Sources */, 54D9E0B427E4F51E003B9AD9 /* Key.swift in Sources */, C4C0E8E227F88B13002D32A9 /* ValetSiteScanner.swift in Sources */, + C42F26732805B4B400938AC7 /* DomainListable.swift in Sources */, 5420395F2613607600FB00FA /* Preferences.swift in Sources */, C48D0C9325CC804200CC7490 /* XibLoadable.swift in Sources */, 54FCFD2A276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */, @@ -1187,6 +1187,7 @@ C41CA5EE2774F8EE00A2C80E /* DomainListVC+Actions.swift in Sources */, 54D9E0B727E4F51E003B9AD9 /* HotKey.swift in Sources */, C4205A7F27F4D21800191A39 /* ValetProxy.swift in Sources */, + C42F26742805B4B400938AC7 /* DomainListable.swift in Sources */, C4F780C425D80B75000DBC97 /* MainMenu.swift in Sources */, 54FCFD2B276C8AA4004CE748 /* CheckboxPreferenceView.swift in Sources */, C415D3B82770F294005EF286 /* Actions.swift in Sources */, @@ -1244,7 +1245,6 @@ C417DC75277614690015E6EE /* Helpers.swift in Sources */, C4080FF727BD8C6400BF2C6B /* BetterAlert.swift in Sources */, C4B97B7C275CF20A003F3378 /* App+GlobalHotkey.swift in Sources */, - C40D88EC27F38D7600C94B40 /* DomainListProxiesCell.swift in Sources */, 54D9E0B327E4F51E003B9AD9 /* HotKeysController.swift in Sources */, C4B97B79275CF1B5003F3378 /* App+ActivationPolicy.swift in Sources */, C4CE3BBB27B324230086CA49 /* MainMenu+Switcher.swift in Sources */, diff --git a/phpmon/Assets.xcassets/IconProxy.imageset/Proxy.png b/phpmon/Assets.xcassets/IconProxy.imageset/Proxy.png index dd150f98e31e01379004b675d1c6cc7d65035882..d9c8ae222e896db0680683e9f2aa0161d64af939 100644 GIT binary patch delta 897 zcmV-{1AhF*1*ZokiBL{Q4GJ0x0000DNk~Le0000P0000P2nGNE0L1BqV*mgFfsrL5 ze+ChwQ7kMhUNTn5j}jYYCZVKhjPh&q=9wRA-puR0H)*m}wo{bY__g3KV5_W^B2u!H zHL*d@c{5WZnR~nEeD3$2bGr9j@I+FYZq@XGp0>^KL_nEeSXAnsslkg+tY6hEV=NS! zrsDXxqssL+J#MYaasQ6Sm6)YLRlV@2e`c7r@TBncnr*neE!?Ul)fM4W;cindD17Vc z(IUUNoG9{_%Vs1T1W&WDlK92ZU#ulfU07aDr=H4crTe%q@y60~v*J5swPO)xf&dCr zj1y#ten!L&(Zc|}vZF$NUm<^njO1!!4RV;Qk|2pqx2RdE9uprIJti|n&h7u-X}((V z!GU6RZvbka9OumsbzAVAcbv~d$N4^j>PNUpm-90RF#IlhzN~fbgKq=QF3VbU2hKO4 z?ZHq@wIEf?^2FotdIC)g&~gn8OU0g*&N;q^$hv&h73}Uom&E&)e*hL5XTg*vV6&62 z0T+J(%t=H+R7i>K)K7>`VH5`N-#1gnpUluGnPL$~&yeG}iev6!dc-h1BXoadbTo^vnr=m2Z7 zI>9QeL#-LP9N#g64Q(b^gwN5~-^}4u$X9>p#!_s?lJLDaiu*W^l{xRhaNeMX(dgW1 zmgHT?Q{E6(*#|3Zg#^P*IQ-90JM$4ir60XSJn#kCLio1$=Qf})V$h<;UBb{ zpij}*860Tgvq^mb2HQ!pt0K@phu@R6|j{v-Sb XA&P{e^epLV00000NkvXXu0mjfgE+gw delta 671 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 - + @@ -437,7 +437,7 @@ - + @@ -532,7 +532,7 @@ Gw