Feature/code updates

Sentinel/Classes/Core/CustomInfoTool.swift

@@ -7,18 +7,13 @@
 
 import SwiftUI
 
-@objcMembers
-public class CustomInfoTool: NSObject, Tool {
-    
+/// Tool which gives the ability to show info + value pairs
+public struct CustomInfoTool: Tool {
+
     // MARK: - Public properties
 
     public let name: String
 
-    @ViewBuilder
-    public var content: any View {
-        SentinelListView(title: name, items: createToolTable(with: info).sections)
-    }
-
     // MARK: - Internal properties
 
     let info: [Section]
@@ -33,6 +28,16 @@ public class CustomInfoTool: NSObject, Tool {
 
 // MARK: - Extensions -
 
+// MARK: - UI
+
+public extension CustomInfoTool {
+
+    var content: any View {
+        SentinelListView(title: name, items: createToolTable(with: info).sections)
+    }
+
+}
+
 // MARK: - Helpers
 
 extension CustomInfoTool {
@@ -48,50 +53,3 @@ extension CustomInfoTool {
     }
 
 }
-
-extension CustomInfoTool {
-
-    public class Section {
-
-        // MARK: - Internal properties
-
-        let title: String?
-        let items: [Item]
-
-        // MARK: - Lifecycle
-
-        public init(title: String? = nil, items: [Item]) {
-            self.title = title
-            self.items = items
-        }
-    }
-
-    public class Item {
-
-        // MARK: - Internal properties
-
-        let title: String
-        let value: String
-
-        // MARK: - Lifecycle
-
-        public init(title: String, value: String) {
-            self.title = title
-            self.value = value
-        }
-    }
-
-}
-
-// MARK: - Equatable and Identifiable conformance
-
-extension CustomInfoTool.Item: Equatable, Identifiable {
-
-    public var id: String {
-        title
-    }
-
-    public static func == (lhs: CustomInfoTool.Item, rhs: CustomInfoTool.Item) -> Bool {
-        lhs.title == rhs.title
-    }
-}

Sentinel/Classes/Core/CustomInfoToolSection.swift

@@ -0,0 +1,62 @@
+//
+//  CustomInfoToolSection.swift
+//  Sentinel
+//
+//  Created by Zvonimir Medak on 18.12.2024..
+//
+
+import Foundation
+
+public extension CustomInfoTool {
+
+    /// Section Item for the CustomInfoTool which expects CustomInfoTool.Item for its items
+    struct Section {
+
+        // MARK: - Internal properties
+
+        let title: String?
+        let items: [Item]
+
+        // MARK: - Lifecycle
+
+        public init(title: String? = nil, items: [Item]) {
+            self.title = title
+            self.items = items
+        }
+    }
+
+    /// Row Item for the CustomInfoTool which will show a title + value pair
+    struct Item {
+
+        // MARK: - Internal properties
+
+        let title: String
+        let value: String
+
+        // MARK: - Lifecycle
+
+        public init(title: String, value: String) {
+            self.title = title
+            self.value = value
+        }
+    }
+
+}
+
+// MARK: - Equatable conformance
+
+extension CustomInfoTool.Item: Equatable {
+
+    public static func == (lhs: CustomInfoTool.Item, rhs: CustomInfoTool.Item) -> Bool {
+        lhs.title == rhs.title
+    }
+}
+
+// MARK: - Identifiable conformance
+
+extension CustomInfoTool.Item: Identifiable {
+
+    public var id: String {
+        title
+    }
+}

CustomToolTableItem.swift → Sentinel/Classes/Core/CustomToolTableItem.swift

@@ -7,11 +7,16 @@
 
 import SwiftUI
 
+/// Item protocol which can be used with ToolTable to show a custom UI
 public protocol CustomToolTableItem: Identifiable, Equatable {
     var title: String { get }
     @ViewBuilder var content: any View { get }
 }
 
+// MARK: - Extensions -
+
+// MARK: - Identifiable helper
+
 public extension CustomToolTableItem {
     var id: String { title }
 }

Sentinel/Classes/Core/Internal/ApplicationTool.swift

@@ -8,7 +8,8 @@
 import Foundation
 import SwiftUI
 
-final class ApplicationTool: Tool {
+/// Tool which shows Plist information about the App
+struct ApplicationTool: Tool {
 
     // MARK: - Public properties -
 
@@ -20,7 +21,7 @@ final class ApplicationTool: Tool {
 
     // MARK: - Private properties -
 
-    private lazy var tool = CustomInfoTool(
+    private let tool = CustomInfoTool(
         name: "Application",
         info: [
             CustomInfoTool.Section(
@@ -42,8 +43,13 @@ final class ApplicationTool: Tool {
             )
         ]
     )
-
-    // MARK: - Internal properties -
+}
+
+// MARK: - Extensions -
+
+// MARK: - UI
+
+extension ApplicationTool {
 
     var toolTable: ToolTable {
         tool.createToolTable(with: tool.info)
@@ -52,22 +58,21 @@ final class ApplicationTool: Tool {
     var content: any View {
         SentinelListView(title: name, items: toolTable.sections)
     }
-
 }
 
-// MARK: - Internal extension
+// MARK: - Info helpers
 
 extension ApplicationTool {
 
-    func stringFromPlist(for key: CFString) -> String {
+    static func stringFromPlist(for key: CFString) -> String {
         stringFromPlist(for: key as String)
     }
 
-    func stringFromPlist(for key: String) -> String {
+    static func stringFromPlist(for key: String) -> String {
         Bundle.main.object(forInfoDictionaryKey: key).map { String(describing: $0) } ?? ""
     }
 
-    var bundleAllInfos: [CustomInfoTool.Item] {
+    static var bundleAllInfos: [CustomInfoTool.Item] {
         Bundle.main.infoDictionary?
             .map { CustomInfoTool.Item(title: $0.key, value: String(describing: $0.value)) }
             ?? []

Sentinel/Classes/Core/Internal/DeviceTool.swift

@@ -8,7 +8,8 @@
 import Foundation
 import SwiftUI
 
-final class DeviceTool: Tool {
+/// Tool which shows current device information
+struct DeviceTool: Tool {
 
     // MARK: - Public properties
 
@@ -18,19 +19,9 @@ final class DeviceTool: Tool {
 
     public init() {}
 
-    // MARK: - Internal properties
-
-    var toolTable: ToolTable {
-        tool.createToolTable(with: tool.info)
-    }
-
-    var content: any View {
-        SentinelListView(title: name, items: toolTable.sections)
-    }
-
     // MARK: - Private properties -
 
-    private lazy var tool = CustomInfoTool(
+    private let tool = CustomInfoTool(
         name: "Device",
         info: [
             CustomInfoTool.Section(title: "Device", items: [
@@ -47,15 +38,28 @@ final class DeviceTool: Tool {
 
 // MARK: - Extensions -
 
-// MARK: - Helpers
+// MARK: - UI
+
+extension DeviceTool {
+
+    var toolTable: ToolTable {
+        tool.createToolTable(with: tool.info)
+    }
+
+    var content: any View {
+        SentinelListView(title: name, items: toolTable.sections)
+    }
+}
+
+// MARK: - Info helpers
 
 private extension DeviceTool {
 
-    var systemVersion: String {
+    static var systemVersion: String {
         "\(UIDevice.current.systemName) \(UIDevice.current.systemVersion)"
     }
 
-    var batteryState: String {
+    static var batteryState: String {
         switch UIDevice.current.batteryState {
         case .charging:
             "Charging at: \(calculateBatteryPercentage(with: UIDevice.current.batteryLevel.description))%"
@@ -68,7 +72,7 @@ private extension DeviceTool {
         }
     }
 
-    func calculateBatteryPercentage(with amount: String) -> String {
+    static func calculateBatteryPercentage(with amount: String) -> String {
         guard let batteryLevel = Double(amount) else { return "Unknown" }
         return "\(batteryLevel * 100.0)"
     }

Sentinel/Classes/Core/Internal/SentinelInternal.swift

@@ -22,23 +22,23 @@ extension Sentinel {
     ) {
         let tabItems = createTabItems(
             with: tools,
-            preferences: preferences,
-            viewController: viewController
+            preferences: preferences
         )
 
         let tabBarController = UIHostingController(rootView: SentinelTabBarView(tabs: tabItems))
         viewController.present(tabBarController, animated: true)
     }
 }
 
-// MARK: - Private extension
+// MARK: - Extensions -
+
+// MARK: - Helpers
 
 private extension Sentinel {
 
     func createTabItems(
         with tools: [Tool],
-        preferences: [ToolTableSection],
-        viewController: UIViewController
+        preferences: [ToolTableSection]
     ) -> [SentinelTabItem] {
         [
             SentinelTabItem(tab: .device),

Sentinel/Classes/Core/Internal/SentinelTabItem.swift

@@ -14,6 +14,13 @@ struct SentinelTabItem {
     init(tab: SentinelTab) {
         self.tab = tab
     }
+}
+
+// MARK: - Extensions -
+
+// MARK: - Helpers
+
+extension SentinelTabItem {
 
     var barItemTitle: String {
         switch tab {
@@ -45,6 +52,8 @@ struct SentinelTabItem {
     }
 }
 
+// MARK: - Private helpers
+
 private extension SentinelTabItem {
 
     var toolTable: ToolTable {

Sentinel/Classes/Core/PerformanceInfo/Internal/CPUInfoProvider.swift

@@ -7,18 +7,20 @@
 
 import Foundation
 
-class CPUInfoProvider {
-
+struct CPUInfoProvider {
+
+    /// Fetches the number of cores the devices has
     var numberOfCores: Int {
-        return ProcessInfo().processorCount
+        ProcessInfo().processorCount
     }
-
+
+    /// Fetches the percentage of the CPU currently being used by the App
     var currentUsage: Double {
         var totalUsageOfCPU: Double = 0.0
         var threadsList: thread_act_array_t?
         var threadsCount = mach_msg_type_number_t(0)
         let threadsResult = withUnsafeMutablePointer(to: &threadsList) {
-            return $0.withMemoryRebound(to: thread_act_array_t?.self, capacity: 1) {
+            $0.withMemoryRebound(to: thread_act_array_t?.self, capacity: 1) {
                 task_threads(mach_task_self_, $0, &threadsCount)
             }
         }

Sentinel/Classes/Core/PerformanceInfo/Internal/MemoryInfoProvider.swift

@@ -12,8 +12,9 @@ struct MemoryUsage {
     let total: Int64
 }
 
-class MemoryInfoProvider {
-
+struct MemoryInfoProvider {
+
+    /// Fetches the current memory usage of the App
     var currentUsage: MemoryUsage {
         var taskInfo = task_vm_info_data_t()
         var count = mach_msg_type_number_t(MemoryLayout<task_vm_info>.size) / 4