feat: combine StatsKit and ModuleKit in the one framework: Kit

Kit/Supporting Files/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.</string>
+	<string>Copyright © 2021 Serhiy Mytrovtsiy. All rights reserved.</string>
 </dict>
 </plist>

Kit/Widgets/BarChart.swift

@@ -1,6 +1,6 @@
 //
 //  BarChart.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 26/04/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class BarChart: WidgetWrapper {
     private var labelState: Bool = false

Kit/Widgets/Battery.swift

@@ -1,6 +1,6 @@
 //
 //  Battery.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 06/06/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class BatterykWidget: WidgetWrapper {
     private var additional: String = "none"

Kit/Widgets/Label.swift

@@ -1,6 +1,6 @@
 //
 //  Label.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 30/03/2021.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class Label: WidgetWrapper {
     private var label: String

Kit/Widgets/LineChart.swift

@@ -1,6 +1,6 @@
 //
 //  Chart.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 18/04/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class LineChart: WidgetWrapper {
     private var labelState: Bool = false

Kit/Widgets/Memory.swift

@@ -1,6 +1,6 @@
 //
 //  Memory.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 30/06/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class MemoryWidget: WidgetWrapper {
     private var orderReversedState: Bool = false

Kit/Widgets/Mini.swift

@@ -1,6 +1,6 @@
 //
 //  Mini.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class Mini: WidgetWrapper {
     private var labelState: Bool = true

Kit/Widgets/NetworkChart.swift

@@ -1,6 +1,6 @@
 //
 //  NetworkChart.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 19/01/2021.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class NetworkChart: WidgetWrapper {
     private var boxState: Bool = false

Kit/Widgets/PieChart.swift

@@ -1,6 +1,6 @@
 //
 //  PieChart.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 30/11/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class PieChart: WidgetWrapper {
     private var labelState: Bool = false

Kit/Widgets/Sensors.swift

@@ -1,6 +1,6 @@
 //
 //  Sensors.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 17/06/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class SensorsWidget: WidgetWrapper {
     private var modeState: String = "automatic"
@@ -186,20 +185,20 @@ public class SensorsWidget: WidgetWrapper {
     public override func settings(width: CGFloat) -> NSView {
         let view = SettingsContainerView(width: width)
         
-        view.addArrangedSubview(selectRow(
-            frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
-            title: localizedString("Display mode"),
-            action: #selector(changeMode),
-            items: SensorsWidgetMode,
-            selected: self.modeState
-        ))
-        
-        view.addArrangedSubview(toggleTitleRow(
-            frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
-            title: localizedString("Static width"),
-            action: #selector(toggleSize),
-            state: self.fixedSizeState
-        ))
+//        view.addArrangedSubview(selectRow(
+//            frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
+//            title: localizedString("Display mode"),
+//            action: #selector(changeMode),
+//            items: SensorsWidgetMode,
+//            selected: self.modeState
+//        ))
+//        
+//        view.addArrangedSubview(toggleTitleRow(
+//            frame: NSRect(x: 0, y: 0, width: view.frame.width, height: Constants.Settings.row),
+//            title: localizedString("Static width"),
+//            action: #selector(toggleSize),
+//            state: self.fixedSizeState
+//        ))
         
         return view
     }

Kit/Widgets/Speed.swift

@@ -1,6 +1,6 @@
 //
 //  Speed.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 24/05/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public class SpeedWidget: WidgetWrapper {
     private var icon: String = "dots"

Kit/constants.swift

@@ -1,6 +1,6 @@
 //
 //  constants.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 15/04/2020.
 //  Using Swift 5.0.

Kit/extensions.swift

@@ -1,6 +1,6 @@
 //
 //  extensions.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2020.
 //  Using Swift 5.0.

Kit/helpers.swift

@@ -1,6 +1,6 @@
 //
 //  helpers.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 29/09/2020.
 //  Using Swift 5.0.
@@ -12,6 +12,26 @@
 
 import Cocoa
 import os.log
+import ServiceManagement
+
+public struct LaunchAtLogin {
+    private static let id = "\(Bundle.main.bundleIdentifier!).LaunchAtLogin"
+    
+    public static var isEnabled: Bool {
+        get {
+            guard let jobs = (SMCopyAllJobDictionaries(kSMDomainUserLaunchd).takeRetainedValue() as? [[String: AnyObject]]) else {
+                return false
+            }
+            
+            let job = jobs.first { $0["Label"] as! String == id }
+            
+            return job?["OnDemand"] as? Bool ?? false
+        }
+        set {
+            SMLoginItemSetEnabled(id as CFString, newValue)
+        }
+    }
+}
 
 public protocol KeyValue_p {
     var key: String { get }

Kit/module/module.swift

@@ -1,6 +1,6 @@
 //
 //  module.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 09/04/2020.
 //  Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.
@@ -8,7 +8,6 @@
 
 import Cocoa
 import os.log
-import StatsKit
 
 public protocol Module_p {
     var available: Bool { get }

Kit/module/popup.swift

@@ -1,6 +1,6 @@
 //
 //  popup.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 11/04/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public protocol Popup_p: NSView {
     var sizeCallback: ((NSSize) -> Void)? { get set }

Kit/module/reader.swift

@@ -1,6 +1,6 @@
 //
 //  reader.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2020.
 //  Using Swift 5.0.
@@ -12,7 +12,6 @@
 import Cocoa
 import Repeat
 import os.log
-import StatsKit
 
 public protocol value_t {
     var widgetValue: Double { get }

Kit/module/settings.swift

@@ -1,6 +1,6 @@
 //
 //  settings.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 13/04/2020.
 //  Using Swift 5.0.
@@ -10,7 +10,6 @@
 //
 
 import Cocoa
-import StatsKit
 
 public protocol Settings_p: NSView {
     var toggleCallback: () -> Void { get set }

Kit/module/widget.swift

@@ -1,6 +1,6 @@
 //
 //  widget.swift
-//  ModuleKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2020.
 //  Using Swift 5.0.
@@ -11,7 +11,6 @@
 
 import Cocoa
 import os.log
-import StatsKit
 
 public enum widget_t: String {
     case unknown = ""

Kit/plugins/Charts.swift

@@ -1,6 +1,6 @@
 //
 //  Chart.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 17/04/2020.
 //  Using Swift 5.0.

Kit/plugins/SMC.swift

@@ -1,6 +1,6 @@
 //
 //  SMC.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 05/04/2020.
 //  Using Swift 5.0.

Kit/plugins/Store.swift

@@ -1,6 +1,6 @@
 //
 //  store.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2020.
 //  Using Swift 5.0.

Kit/plugins/SystemKit.swift

@@ -1,6 +1,6 @@
 //
 //  SystemKit.swift
-//  Stats
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 13/04/2020.
 //  Using Swift 5.0.

Kit/types.swift

@@ -1,6 +1,6 @@
 //
 //  types.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 10/04/2021.
 //  Using Swift 5.0.

Kit/updater/updater.swift

@@ -1,6 +1,6 @@
 //
 //  updater.swift
-//  StatsKit
+//  Kit
 //
 //  Created by Serhiy Mytrovtsiy on 14/04/2020.
 //  Using Swift 5.0.

Modules/Battery/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import IOKit.ps
 
 struct Battery_Usage: value_t {

Modules/Battery/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSView, Popup_p {
     private var title: String

Modules/Battery/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import os.log
 
 internal class UsageReader: Reader<Battery_Usage> {

Modules/Battery/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import SystemConfiguration
 
 internal class Settings: NSView, Settings_v {

Modules/CPU/main.swift

@@ -7,8 +7,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 public struct CPU_Load: value_t {
     var totalUsage: Double = 0

Modules/CPU/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSView, Popup_p {
     private var title: String

Modules/CPU/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import os.log
 
 internal class LoadReader: Reader<CPU_Load> {

Modules/CPU/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSView, Settings_v {
     private var usagePerCoreState: Bool = false

Modules/Disk/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 public struct stats {
     var read: Int64 = 0

Modules/Disk/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSView, Popup_p {
     private let diskFullHeight: CGFloat = 62

Modules/Disk/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 import IOKit
 import Darwin
 import os.log

Modules/Disk/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSView, Settings_v {
     private var removableState: Bool = false

Modules/Fans/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 public struct Fan {
     public let id: Int

Modules/Fans/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSStackView, Popup_p {
     public var sizeCallback: ((NSSize) -> Void)? = nil

Modules/Fans/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 import os.log
 
 internal class FansReader: Reader<[Fan]> {

Modules/Fans/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSStackView, Settings_v {
     private var updateIntervalValue: Int = 1

Modules/GPU/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 public typealias GPU_type = String
 public enum GPU_types: GPU_type {

Modules/GPU/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Popup: NSStackView, Popup_p {
     public var sizeCallback: ((NSSize) -> Void)? = nil

Modules/GPU/reader.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import os.log
 
 public struct device {

Modules/GPU/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSView, Settings_v {
     private var updateIntervalValue: Int = 1

Modules/Net/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import SystemConfiguration
 
 public enum Network_t: String {

Modules/Net/popup.swift

@@ -11,8 +11,7 @@
 // swiftlint:disable file_length
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 // swiftlint:disable type_body_length
 internal class Popup: NSStackView, Popup_p {

Modules/Net/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import SystemConfiguration
 import Reachability
 import os.log

Modules/Net/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import SystemConfiguration
 
 internal class Settings: NSView, Settings_v {

Modules/RAM/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 public struct RAM_Usage: value_t {
     var total: Double

Modules/RAM/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSView, Popup_p {
     private var title: String

Modules/RAM/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import os.log
 
 internal class UsageReader: Reader<RAM_Usage> {

Modules/RAM/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSView, Settings_v {
     private var updateIntervalValue: Int = 1

Modules/Sensors/main.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 public class Sensors: Module {
     private var sensorsReader: SensorsReader

Modules/Sensors/popup.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 internal class Popup: NSView, Popup_p {
     private var list: [String: NSTextField] = [:]

Modules/Sensors/readers.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 import os.log
 import IOKit.hid
 

Modules/Sensors/settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 
 internal class Settings: NSView, Settings_v {
     private var updateIntervalValue: Int = 3

Modules/Sensors/values.swift

@@ -9,7 +9,7 @@
 //  Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.
 //
 
-import StatsKit
+import Kit
 
 enum SensorGroup: String {
     case CPU = "CPU"

Stats/AppDelegate.swift

@@ -9,8 +9,7 @@
 import Cocoa
 import os.log
 
-import StatsKit
-import ModuleKit
+import Kit
 
 import CPU
 import RAM

Stats/Views/AppSettings.swift

@@ -10,7 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
+import Kit
 import os.log
 
 class ApplicationSettings: NSScrollView {

Stats/Views/Dashboard.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
-import ModuleKit
+import Kit
 import os.log
 
 class Dashboard: NSScrollView {

Stats/Views/Settings.swift

@@ -10,8 +10,7 @@
 //
 
 import Cocoa
-import ModuleKit
-import StatsKit
+import Kit
 
 class SettingsWindow: NSWindow, NSWindowDelegate {
     private let viewController: SettingsViewController = SettingsViewController()

Stats/Views/Update.swift

@@ -10,7 +10,7 @@
 //
 
 import Cocoa
-import StatsKit
+import Kit
 import os.log
 
 class UpdateWindow: NSWindow, NSWindowDelegate {

Stats/helpers.swift

@@ -10,8 +10,8 @@
 //
 
 import Cocoa
+import Kit
 import os.log
-import StatsKit
 
 extension AppDelegate {
     internal func parseArguments() {

StatsKit/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.</string>
-</dict>
-</plist>

StatsKit/StatsKit.h

@@ -1,15 +0,0 @@
-//
-//  StatsKit.h
-//  StatsKit
-//
-//  Created by Serhiy Mytrovtsiy on 14/04/2020.
-//  Using Swift 5.0.
-//  Running on macOS 10.15.
-//
-//  Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-FOUNDATION_EXPORT double StatsKitVersionNumber;
-FOUNDATION_EXPORT const unsigned char StatsKitVersionString[];

StatsKit/launchAtLogin.swift

@@ -1,32 +0,0 @@
-//
-//  launchAtLogin.swift
-//  StatsKit
-//
-//  Created by Serhiy Mytrovtsiy on 14/04/2020.
-//  Using Swift 5.0.
-//  Running on macOS 10.15.
-//
-//  Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.
-//
-
-import Cocoa
-import ServiceManagement
-
-public struct LaunchAtLogin {
-    private static let id = "\(Bundle.main.bundleIdentifier!).LaunchAtLogin"
-    
-    public static var isEnabled: Bool {
-        get {
-            guard let jobs = (SMCopyAllJobDictionaries(kSMDomainUserLaunchd).takeRetainedValue() as? [[String: AnyObject]]) else {
-                return false
-            }
-            
-            let job = jobs.first { $0["Label"] as! String == id }
-            
-            return job?["OnDemand"] as? Bool ?? false
-        }
-        set {
-            SMLoginItemSetEnabled(id as CFString, newValue)
-        }
-    }
-}