diff --git a/Modules/Sensors/main.swift b/Modules/Sensors/main.swift index 155243c8..aa9bb7a6 100644 --- a/Modules/Sensors/main.swift +++ b/Modules/Sensors/main.swift @@ -1,6 +1,6 @@ // // main.swift -// Stats +// Sensors // // Created by Serhiy Mytrovtsiy on 17/06/2020. // Using Swift 5.0. diff --git a/ModuleKit/Widgets/popup.swift b/Modules/Sensors/popup.swift similarity index 99% rename from ModuleKit/Widgets/popup.swift rename to Modules/Sensors/popup.swift index c90fd63b..a149236c 100644 --- a/ModuleKit/Widgets/popup.swift +++ b/Modules/Sensors/popup.swift @@ -1,6 +1,6 @@ // // popup.swift -// Stats +// Sensors // // Created by Serhiy Mytrovtsiy on 22/06/2020. // Using Swift 5.0. diff --git a/Modules/Sensors/readers.swift b/Modules/Sensors/readers.swift index 016ce545..6ac9cc04 100644 --- a/Modules/Sensors/readers.swift +++ b/Modules/Sensors/readers.swift @@ -1,6 +1,6 @@ // // readers.swift -// Stats +// Sensors // // Created by Serhiy Mytrovtsiy on 17/06/2020. // Using Swift 5.0. diff --git a/ModuleKit/Widgets/settings.swift b/Modules/Sensors/settings.swift similarity index 99% rename from ModuleKit/Widgets/settings.swift rename to Modules/Sensors/settings.swift index 781c6db0..d8e722d9 100644 --- a/ModuleKit/Widgets/settings.swift +++ b/Modules/Sensors/settings.swift @@ -1,6 +1,6 @@ // // settings.swift -// Stats +// Sensors // // Created by Serhiy Mytrovtsiy on 23/06/2020. // Using Swift 5.0. diff --git a/Modules/Sensors/values.swift b/Modules/Sensors/values.swift index c8c4743c..57eba2f2 100644 --- a/Modules/Sensors/values.swift +++ b/Modules/Sensors/values.swift @@ -1,6 +1,6 @@ // // values.swift -// Stats +// Sensors // // Created by Serhiy Mytrovtsiy on 17/06/2020. // Using Swift 5.0. diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj index cd06f0f6..1faa39e2 100644 --- a/Stats.xcodeproj/project.pbxproj +++ b/Stats.xcodeproj/project.pbxproj @@ -18,8 +18,6 @@ 9A0C82EB24460FB100FAE3D4 /* StatsKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A0C82DA24460F7200FAE3D4 /* StatsKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9A0C82EE2446124800FAE3D4 /* SystemKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A7D0CB62444C2C800B09070 /* SystemKit.swift */; }; 9A1A7ABA24561F0B00A84F7A /* BarChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1A7AB924561F0B00A84F7A /* BarChart.swift */; }; - 9A2DD8CC24A1190A00F6F48D /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2DD8CB24A1190A00F6F48D /* popup.swift */; }; - 9A2DD8CD24A1193500F6F48D /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2DD8CB24A1190A00F6F48D /* popup.swift */; }; 9A313BF7247EF01800DB5101 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5349CD23D8832E00C23824 /* Reachability.framework */; }; 9A313BF8247EF01800DB5101 /* Reachability.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5349CD23D8832E00C23824 /* Reachability.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9A34353B243E278D006B19F9 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A34353A243E278D006B19F9 /* main.swift */; }; @@ -39,6 +37,8 @@ 9A3E17E8247AA8E100449CD1 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17E7247AA8E100449CD1 /* Network.swift */; }; 9A3E17EA247B07BF00449CD1 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A3E17E9247B07BF00449CD1 /* popup.swift */; }; 9A41530C24ABC3AF00A2BDA7 /* Disk.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A41530B24ABC3AF00A2BDA7 /* Disk.swift */; }; + 9A58DE9E24B363D800716A9F /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A58DE9D24B363D800716A9F /* popup.swift */; }; + 9A58DEA024B363F300716A9F /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A58DE9F24B363F300716A9F /* settings.swift */; }; 9A5AF11B2469CE9B00684737 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A5AF11A2469CE9B00684737 /* popup.swift */; }; 9A6549292440A57200E30B74 /* Repeat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A6549282440A57200E30B74 /* Repeat.framework */; }; 9A65492A2440A57200E30B74 /* Repeat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9A6549282440A57200E30B74 /* Repeat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -64,8 +64,6 @@ 9A944D6124492B6D0058F32A /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A944D6024492B6D0058F32A /* popup.swift */; }; 9A9D728A24471FAE005CF997 /* SMC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D728924471FAE005CF997 /* SMC.swift */; }; 9A9EA9452476D34500E3B883 /* Update.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9EA9442476D34500E3B883 /* Update.swift */; }; - 9A9FB99E24A2865B00FD072C /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9FB99D24A2865B00FD072C /* settings.swift */; }; - 9A9FB99F24A2866500FD072C /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9FB99D24A2865B00FD072C /* settings.swift */; }; 9AA4A00A2443656D00ECCF07 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9AA4A0092443656D00ECCF07 /* Assets.xcassets */; }; 9AA64260244B274200416A33 /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA6425F244B274200416A33 /* popup.swift */; }; 9AA64262244B57C800416A33 /* settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA64261244B57C800416A33 /* settings.swift */; }; @@ -106,8 +104,6 @@ 9AE29AF3249A51D70071B02D /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF1249A50CD0071B02D /* main.swift */; }; 9AE29AF5249A52870071B02D /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AE29AF4249A52870071B02D /* config.plist */; }; 9AE29AF6249A52B00071B02D /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9AE29AF4249A52870071B02D /* config.plist */; }; - 9AE29AF8249A53420071B02D /* values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF7249A53420071B02D /* values.swift */; }; - 9AE29AFA249A53780071B02D /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF9249A53780071B02D /* readers.swift */; }; 9AE29AFB249A53DC0071B02D /* readers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF9249A53780071B02D /* readers.swift */; }; 9AE29AFC249A53DC0071B02D /* values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AF7249A53420071B02D /* values.swift */; }; 9AE29AFE249A82B70071B02D /* Sensors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AE29AFD249A82B70071B02D /* Sensors.swift */; }; @@ -407,7 +403,6 @@ 9A1410F5229E721100D29793 /* Stats.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Stats.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9A141101229E721200D29793 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A1A7AB924561F0B00A84F7A /* BarChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarChart.swift; sourceTree = ""; }; - 9A2DD8CB24A1190A00F6F48D /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = popup.swift; path = ModuleKit/Widgets/popup.swift; sourceTree = SOURCE_ROOT; }; 9A343527243E26A0006B19F9 /* LaunchAtLogin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LaunchAtLogin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9A343535243E26A0006B19F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9A343536243E26A0006B19F9 /* LaunchAtLogin.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLogin.entitlements; sourceTree = ""; }; @@ -421,6 +416,8 @@ 9A3E17E9247B07BF00449CD1 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A41530B24ABC3AF00A2BDA7 /* Disk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Disk.swift; sourceTree = ""; }; 9A5349CD23D8832E00C23824 /* Reachability.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reachability.framework; path = Carthage/Build/Mac/Reachability.framework; sourceTree = ""; }; + 9A58DE9D24B363D800716A9F /* popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; + 9A58DE9F24B363F300716A9F /* settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; 9A5AF11A2469CE9B00684737 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9A654920244074B500E30B74 /* extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = extensions.swift; sourceTree = ""; }; 9A65492224407EA600E30B74 /* store.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = store.swift; sourceTree = ""; }; @@ -446,7 +443,6 @@ 9A998CD922A199970087ADE7 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; 9A9D728924471FAE005CF997 /* SMC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SMC.swift; sourceTree = ""; }; 9A9EA9442476D34500E3B883 /* Update.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Update.swift; sourceTree = ""; }; - 9A9FB99D24A2865B00FD072C /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = settings.swift; path = ModuleKit/Widgets/settings.swift; sourceTree = SOURCE_ROOT; }; 9AA4A0092443656D00ECCF07 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9AA6425F244B274200416A33 /* popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = popup.swift; sourceTree = ""; }; 9AA64261244B57C800416A33 /* settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = settings.swift; sourceTree = ""; }; @@ -784,14 +780,13 @@ children = ( 9AE29AF1249A50CD0071B02D /* main.swift */, 9AE29AF9249A53780071B02D /* readers.swift */, - 9A2DD8CB24A1190A00F6F48D /* popup.swift */, - 9A9FB99D24A2865B00FD072C /* settings.swift */, + 9A58DE9D24B363D800716A9F /* popup.swift */, + 9A58DE9F24B363F300716A9F /* settings.swift */, 9AE29AF7249A53420071B02D /* values.swift */, 9AE29AEC249A50960071B02D /* Info.plist */, 9AE29AF4249A52870071B02D /* config.plist */, ); - name = Sensors; - path = ../Sensors; + path = Sensors; sourceTree = ""; }; 9AF9EE0324648751005D2270 /* Disk */ = { @@ -1272,13 +1267,9 @@ files = ( 9AABEB7E243FDEF100668CB0 /* main.swift in Sources */, 9AABEB7A243FD26200668CB0 /* AppDelegate.swift in Sources */, - 9A2DD8CC24A1190A00F6F48D /* popup.swift in Sources */, - 9AE29AFA249A53780071B02D /* readers.swift in Sources */, 9A9EA9452476D34500E3B883 /* Update.swift in Sources */, - 9A9FB99E24A2865B00FD072C /* settings.swift in Sources */, 9A81C74E24499C7000825D92 /* Settings.swift in Sources */, 9A81C74D24499C7000825D92 /* AppSettings.swift in Sources */, - 9AE29AF8249A53420071B02D /* values.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1355,11 +1346,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9A9FB99F24A2866500FD072C /* settings.swift in Sources */, - 9A2DD8CD24A1193500F6F48D /* popup.swift in Sources */, 9AE29AFB249A53DC0071B02D /* readers.swift in Sources */, 9AE29AFC249A53DC0071B02D /* values.swift in Sources */, + 9A58DE9E24B363D800716A9F /* popup.swift in Sources */, 9AE29AF3249A51D70071B02D /* main.swift in Sources */, + 9A58DEA024B363F300716A9F /* settings.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };