From c23ab61da3a9151c960a54586e54f139d2bac1b7 Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Tue, 2 Aug 2022 13:23:52 +0200
Subject: [PATCH 1/7] Add SPM support, fix missing UIKit imports

---
 .../contents.xcworkspacedata                  |  7 +++++
 Package.resolved                              | 25 +++++++++++++++++
 Package.swift                                 | 27 +++++++++++++++++++
 Sentinel/Classes/Core/CustomInfoTool.swift    |  2 +-
 .../Classes/Core/Internal/Sentinel.storyboard |  6 ++---
 .../Core/Internal/SentinelInternal.swift      |  1 -
 .../Internal/SentinelTabBarController.swift   |  2 +-
 .../Core/Internal/UIImage+Assets.swift        |  2 +-
 .../Items/PerformanceInfoItem.swift           |  2 +-
 .../PreferencesInfo/OptionSwitchItem.swift    |  2 +-
 .../PreferencesInfo/PreferencesTool.swift     |  2 +-
 .../Classes/Core/SourceScreenProvider.swift   |  2 +-
 Sentinel/Classes/Core/Tool.swift              |  2 +-
 Sentinel/Classes/Core/ToolTable.swift         |  2 +-
 Sentinel/Classes/Core/ToolTableItem.swift     |  2 +-
 .../ToolTableItems/DetailToolTableCell.swift  |  2 +-
 .../NavigationToolTableCell.swift             |  2 +-
 Sentinel/Classes/Core/UIImage+Bundle.swift    |  3 ++-
 .../CustomLocation/CustomLocationTool.swift   |  2 +-
 .../Classes/TextEditing/TextEditingTool.swift |  2 +-
 .../UserDefaults/UserDefaults.storyboard      |  6 ++---
 .../UserDefaults/UserDefaultsTool.swift       |  2 +-
 .../UserDefaultsViewController.swift          |  2 +-
 23 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 create mode 100644 Package.resolved
 create mode 100644 Package.swift

diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..b8eeed1
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Collar",
+        "repositoryURL": "https://github.com/infinum/ios-collar.git",
+        "state": {
+          "branch": null,
+          "revision": "7495356c5df25b878d6a28b3106edc869de18f0b",
+          "version": "1.0.2"
+        }
+      },
+      {
+        "package": "Loggie",
+        "repositoryURL": "https://github.com/infinum/iOS-Loggie.git",
+        "state": {
+          "branch": null,
+          "revision": "6a526554fb857bd713463702503d538bf2d1ba52",
+          "version": "2.3.2"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
new file mode 100644
index 0000000..e2db01f
--- /dev/null
+++ b/Package.swift
@@ -0,0 +1,27 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Sentinel",
+    platforms: [
+        .iOS(.v11)
+    ],
+    products: [
+        .library(
+            name: "Sentinel",
+            targets: ["Sentinel"])
+    ],
+    dependencies: [
+        .package(name: "Loggie", url: "https://github.com/infinum/iOS-Loggie.git", .upToNextMajor(from: "2.3.2")),
+        .package(name: "Collar", url: "https://github.com/infinum/ios-collar.git", .upToNextMajor(from: "1.0.2"))
+    ],
+    targets: [
+        .target(
+            name: "Sentinel",
+            dependencies: ["Loggie", "Collar"],
+            path: "Sentinel/Classes"
+        )
+    ]
+)
diff --git a/Sentinel/Classes/Core/CustomInfoTool.swift b/Sentinel/Classes/Core/CustomInfoTool.swift
index f0377e7..6c854f1 100644
--- a/Sentinel/Classes/Core/CustomInfoTool.swift
+++ b/Sentinel/Classes/Core/CustomInfoTool.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class CustomInfoTool: NSObject, Tool {
diff --git a/Sentinel/Classes/Core/Internal/Sentinel.storyboard b/Sentinel/Classes/Core/Internal/Sentinel.storyboard
index e7d157c..8e06047 100644
--- a/Sentinel/Classes/Core/Internal/Sentinel.storyboard
+++ b/Sentinel/Classes/Core/Internal/Sentinel.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Sdy-Ei-cBG">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Sdy-Ei-cBG">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment version="4096" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <deployment version="4368" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git a/Sentinel/Classes/Core/Internal/SentinelInternal.swift b/Sentinel/Classes/Core/Internal/SentinelInternal.swift
index a59cb5f..7ea894c 100644
--- a/Sentinel/Classes/Core/Internal/SentinelInternal.swift
+++ b/Sentinel/Classes/Core/Internal/SentinelInternal.swift
@@ -5,7 +5,6 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
 import UIKit
 
 extension Sentinel {
diff --git a/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift b/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift
index b1bbe5b..1024fd2 100644
--- a/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift
+++ b/Sentinel/Classes/Core/Internal/SentinelTabBarController.swift
@@ -5,7 +5,7 @@
 //  Created by Zvonimir Medak on 28.09.2021..
 //
 
-import Foundation
+import UIKit
 
 final class SentinelTabBarController: UITabBarController {
 
diff --git a/Sentinel/Classes/Core/Internal/UIImage+Assets.swift b/Sentinel/Classes/Core/Internal/UIImage+Assets.swift
index ab896a2..68afe09 100644
--- a/Sentinel/Classes/Core/Internal/UIImage+Assets.swift
+++ b/Sentinel/Classes/Core/Internal/UIImage+Assets.swift
@@ -5,7 +5,7 @@
 //  Created by Zvonimir Medak on 15.11.2021..
 //
 
-import Foundation
+import UIKit
 
 extension UIImage {
     enum SentinelImages{}
diff --git a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift
index cf3b017..f2aa5a5 100644
--- a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift
+++ b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoItem.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 18/11/2020.
 //
 
-import Foundation
+import UIKit
 
 class PerformanceInfoItem: NSObject {
 
diff --git a/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift b/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift
index ff59bf3..b7dc073 100644
--- a/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift
+++ b/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchItem.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 02/10/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Provides option to change enabled state of the feature.
 @objcMembers
diff --git a/Sentinel/Classes/Core/PreferencesInfo/PreferencesTool.swift b/Sentinel/Classes/Core/PreferencesInfo/PreferencesTool.swift
index 557b60a..30b219d 100644
--- a/Sentinel/Classes/Core/PreferencesInfo/PreferencesTool.swift
+++ b/Sentinel/Classes/Core/PreferencesInfo/PreferencesTool.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 02/10/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Provides functionality which gives the user ability
 /// to change environment variables in the application.
diff --git a/Sentinel/Classes/Core/SourceScreenProvider.swift b/Sentinel/Classes/Core/SourceScreenProvider.swift
index 782ca90..90562d3 100644
--- a/Sentinel/Classes/Core/SourceScreenProvider.swift
+++ b/Sentinel/Classes/Core/SourceScreenProvider.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Defines source screen which will be used to present Sentinel when triggered.
 @objc
diff --git a/Sentinel/Classes/Core/Tool.swift b/Sentinel/Classes/Core/Tool.swift
index 338b5ed..28b6451 100644
--- a/Sentinel/Classes/Core/Tool.swift
+++ b/Sentinel/Classes/Core/Tool.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Defines tool behaviour.
 @objc
diff --git a/Sentinel/Classes/Core/ToolTable.swift b/Sentinel/Classes/Core/ToolTable.swift
index f7fe659..8a57d77 100644
--- a/Sentinel/Classes/Core/ToolTable.swift
+++ b/Sentinel/Classes/Core/ToolTable.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Defines tool datasouce which can present different tool sections.
 @objcMembers
diff --git a/Sentinel/Classes/Core/ToolTableItem.swift b/Sentinel/Classes/Core/ToolTableItem.swift
index dd07476..238a8c8 100644
--- a/Sentinel/Classes/Core/ToolTableItem.swift
+++ b/Sentinel/Classes/Core/ToolTableItem.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 29/09/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Defines tool item behaviour and appearance.
 @objc
diff --git a/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.swift b/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.swift
index 89be663..2b55150 100644
--- a/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.swift
+++ b/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class DetailToolTableItem: NSObject {
diff --git a/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.swift b/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.swift
index 13c88a3..369334e 100644
--- a/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.swift
+++ b/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class NavigationToolTableItem: NSObject {
diff --git a/Sentinel/Classes/Core/UIImage+Bundle.swift b/Sentinel/Classes/Core/UIImage+Bundle.swift
index 75de66e..000bd34 100644
--- a/Sentinel/Classes/Core/UIImage+Bundle.swift
+++ b/Sentinel/Classes/Core/UIImage+Bundle.swift
@@ -5,7 +5,8 @@
 //  Created by Zvonimir Medak on 30.09.2021..
 //
 
-import Foundation
+import UIKit
+
 extension UIImage {
 
     static func load(fromBundleNamed name: String) -> UIImage? {
diff --git a/Sentinel/Classes/CustomLocation/CustomLocationTool.swift b/Sentinel/Classes/CustomLocation/CustomLocationTool.swift
index 2e9c638..d253e40 100644
--- a/Sentinel/Classes/CustomLocation/CustomLocationTool.swift
+++ b/Sentinel/Classes/CustomLocation/CustomLocationTool.swift
@@ -5,7 +5,7 @@
 //  Created by Nikola Majcen on 01/10/2020.
 //
 
-import Foundation
+import UIKit
 
 /// Tool which gives the ability to change current user location.
 ///
diff --git a/Sentinel/Classes/TextEditing/TextEditingTool.swift b/Sentinel/Classes/TextEditing/TextEditingTool.swift
index c3efb9d..39447f2 100644
--- a/Sentinel/Classes/TextEditing/TextEditingTool.swift
+++ b/Sentinel/Classes/TextEditing/TextEditingTool.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 31/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class TextEditingTool: NSObject, Tool {
diff --git a/Sentinel/Classes/UserDefaults/UserDefaults.storyboard b/Sentinel/Classes/UserDefaults/UserDefaults.storyboard
index 434b5cb..e3fbd6d 100644
--- a/Sentinel/Classes/UserDefaults/UserDefaults.storyboard
+++ b/Sentinel/Classes/UserDefaults/UserDefaults.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mCZ-Gc-mbD">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mCZ-Gc-mbD">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment version="4096" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <deployment version="4368" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git a/Sentinel/Classes/UserDefaults/UserDefaultsTool.swift b/Sentinel/Classes/UserDefaults/UserDefaultsTool.swift
index f086b1d..848927f 100644
--- a/Sentinel/Classes/UserDefaults/UserDefaultsTool.swift
+++ b/Sentinel/Classes/UserDefaults/UserDefaultsTool.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 @objcMembers
 public class UserDefaultsTool: NSObject, Tool {
diff --git a/Sentinel/Classes/UserDefaults/UserDefaultsViewController.swift b/Sentinel/Classes/UserDefaults/UserDefaultsViewController.swift
index fe73b1e..8a51bef 100644
--- a/Sentinel/Classes/UserDefaults/UserDefaultsViewController.swift
+++ b/Sentinel/Classes/UserDefaults/UserDefaultsViewController.swift
@@ -5,7 +5,7 @@
 //  Created by Vlaho Poluta on 30/07/2020.
 //
 
-import Foundation
+import UIKit
 
 extension UIStoryboard {
     static var userDefaults: UIStoryboard { UIStoryboard(name: "UserDefaults", bundle: .sentinel) }

From 97882a6318a9e54b033e56c0a8d143fd102bcc30 Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Tue, 2 Aug 2022 13:24:42 +0200
Subject: [PATCH 2/7] Bump pod version

---
 Sentinel.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sentinel.podspec b/Sentinel.podspec
index 307c0c7..c659e04 100644
--- a/Sentinel.podspec
+++ b/Sentinel.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Sentinel'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'Developer\'s toolbox for debugging applications'
 
   s.description      = <<-DESC

From d65bba85f8f01e4c739ec70afc97bba7c63fc222 Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Thu, 4 Aug 2022 08:56:18 +0200
Subject: [PATCH 3/7] Add SPM support

---
 Package.resolved                              |  8 +++----
 Package.swift                                 |  9 +++++---
 README.md                                     | 12 ++++++++++
 .../Classes/Core/Internal/Sentinel.storyboard |  4 ++--
 .../Internal/SentinelUIKitExtensions.swift    |  8 ++++++-
 .../Items/PerformanceInfoTableViewCell.xib    |  6 ++---
 .../PerformanceInfo.storyboard                | 10 ++++----
 .../OptionSwitchTableViewCell.xib             |  8 +++----
 .../ToolTableItems/DetailToolTableCell.xib    | 10 ++++----
 .../NavigationToolTableCell.xib               | 10 ++++----
 Sentinel/Classes/Core/UIImage+Bundle.swift    |  6 +++++
 .../TextEditing/TextEditing.storyboard        | 23 +++++++++++++------
 12 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/Package.resolved b/Package.resolved
index b8eeed1..0a0daa4 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/infinum/ios-collar.git",
         "state": {
           "branch": null,
-          "revision": "7495356c5df25b878d6a28b3106edc869de18f0b",
-          "version": "1.0.2"
+          "revision": "f3c483ee7721146e4f846eb8d494542e5337c624",
+          "version": "1.0.3"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/infinum/iOS-Loggie.git",
         "state": {
           "branch": null,
-          "revision": "6a526554fb857bd713463702503d538bf2d1ba52",
-          "version": "2.3.2"
+          "revision": "52180de1deabc66fda6e974dcf335e10e0f86036",
+          "version": "2.3.3"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index e2db01f..c4cdaf4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,14 +14,17 @@ let package = Package(
             targets: ["Sentinel"])
     ],
     dependencies: [
-        .package(name: "Loggie", url: "https://github.com/infinum/iOS-Loggie.git", .upToNextMajor(from: "2.3.2")),
-        .package(name: "Collar", url: "https://github.com/infinum/ios-collar.git", .upToNextMajor(from: "1.0.2"))
+        .package(name: "Loggie", url: "https://github.com/infinum/iOS-Loggie.git", .upToNextMajor(from: "2.3.3")),
+        .package(name: "Collar", url: "https://github.com/infinum/ios-collar.git", .upToNextMajor(from: "1.0.3"))
     ],
     targets: [
         .target(
             name: "Sentinel",
             dependencies: ["Loggie", "Collar"],
-            path: "Sentinel/Classes"
+            path: "Sentinel",
+            resources: [
+                .process("Assets")
+            ]
         )
     ]
 )
diff --git a/README.md b/README.md
index 5b46ed4..63bd6b6 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ To run the example project, clone the repo, and run `pod install` from the Examp
 
 ## Installation
 
+### CocoaPods
+
 Sentinel is available through [CocoaPods](https://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
@@ -34,6 +36,16 @@ it, simply add the following line to your Podfile:
 pod 'Sentinel'
 ```
 
+### Swift Package Manager
+
+If you are using SPM for your dependency manager, add this to the dependencies in your `Package.swift` file:
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/infinum/ios-sentinel.git")
+]
+```
+
 ## Usage
 
 ### Features
diff --git a/Sentinel/Classes/Core/Internal/Sentinel.storyboard b/Sentinel/Classes/Core/Internal/Sentinel.storyboard
index 8e06047..1ef1ea6 100644
--- a/Sentinel/Classes/Core/Internal/Sentinel.storyboard
+++ b/Sentinel/Classes/Core/Internal/Sentinel.storyboard
@@ -28,7 +28,7 @@
         <!--Sentinel Table View Controller-->
         <scene sceneID="FDi-AI-Vt5">
             <objects>
-                <viewController storyboardIdentifier="SentinelTableViewController" id="rmC-9c-kFK" customClass="SentinelTableViewController" customModule="Sentinel" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SentinelTableViewController" id="rmC-9c-kFK" customClass="SentinelTableViewController" customModule="Sentinel" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="aU9-Yk-LHE">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -63,7 +63,7 @@
         <!--Sentinel Tab Bar Controller-->
         <scene sceneID="B2D-lr-0y9">
             <objects>
-                <tabBarController storyboardIdentifier="SentinelTabBarController" id="n1S-5p-dpw" customClass="SentinelTabBarController" customModule="Sentinel" customModuleProvider="target" sceneMemberID="viewController">
+                <tabBarController storyboardIdentifier="SentinelTabBarController" id="n1S-5p-dpw" customClass="SentinelTabBarController" customModule="Sentinel" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="HPj-di-FwW">
                         <barButtonItem key="rightBarButtonItem" systemItem="done" id="aCt-BR-H3G">
                             <connections>
diff --git a/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift b/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift
index 4271237..d5d9cd4 100644
--- a/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift
+++ b/Sentinel/Classes/Core/Internal/SentinelUIKitExtensions.swift
@@ -8,7 +8,13 @@
 import UIKit
 
 extension Bundle {
-    static var sentinel: Bundle { Bundle(for: Sentinel.self) }
+    static var sentinel: Bundle {
+        #if SWIFT_PACKAGE
+        .module
+        #else
+        Bundle(for: Sentinel.self)
+        #endif
+    }
 }
 
 extension UIStoryboard {
diff --git a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib
index 1898763..09bbd8a 100644
--- a/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib
+++ b/Sentinel/Classes/Core/PerformanceInfo/Items/PerformanceInfoTableViewCell.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="NUF-bl-auo" customClass="PerformanceInfoTableViewCell" customModule="ToolBox" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="NUF-bl-auo" customClass="PerformanceInfoTableViewCell" customModule="Sentinel">
             <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="NUF-bl-auo" id="2WE-a2-yhl">
diff --git a/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard b/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard
index 78cfea3..bcbc1de 100644
--- a/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard
+++ b/Sentinel/Classes/Core/PerformanceInfo/PerformanceInfo.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
         <!--Performance Info View Controller-->
         <scene sceneID="pfq-In-raC">
             <objects>
-                <viewController storyboardIdentifier="PerformanceInfoViewController" id="PQf-hC-S7N" customClass="PerformanceInfoViewController" customModule="ToolBox" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PerformanceInfoViewController" id="PQf-hC-S7N" customClass="PerformanceInfoViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="V6M-Il-AHB">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -21,8 +21,8 @@
                                 <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <color key="backgroundColor" systemColor="systemGroupedBackgroundColor"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="unY-ZM-oPM" customClass="PerformanceInfoTableViewCell" customModule="ToolBox" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="55.5" width="414" height="43"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PerformanceInfoTableViewCell" id="unY-ZM-oPM" customClass="PerformanceInfoTableViewCell" customModule="Sentinel">
+                                        <rect key="frame" x="0.0" y="49.5" width="414" height="43"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="unY-ZM-oPM" id="e1p-K7-kYu">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43"/>
diff --git a/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchTableViewCell.xib b/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchTableViewCell.xib
index 0c05948..50b6409 100644
--- a/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchTableViewCell.xib
+++ b/Sentinel/Classes/Core/PreferencesInfo/OptionSwitchTableViewCell.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="OptionSwitchTableViewCell" id="iGa-no-8AY" customClass="OptionSwitchTableViewCell" customModule="ToolBox" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="OptionSwitchTableViewCell" id="iGa-no-8AY" customClass="OptionSwitchTableViewCell" customModule="Sentinel">
             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="iGa-no-8AY" id="al1-dt-ptS">
@@ -20,7 +20,7 @@
                         <rect key="frame" x="20" y="6" width="374" height="31.5"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OZs-mR-7Hb">
-                                <rect key="frame" x="0.0" y="0.0" width="179" height="31.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="41.5" height="31.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.xib b/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.xib
index a38355b..dff5249 100644
--- a/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.xib
+++ b/Sentinel/Classes/Core/ToolTableItems/DetailToolTableCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="58" id="KGk-i7-Jjw" customClass="DetailToolTableCell" customModule="ToolBox" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="58" id="KGk-i7-Jjw" customClass="DetailToolTableCell" customModule="Sentinel">
             <rect key="frame" x="0.0" y="0.0" width="320" height="58"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -21,13 +21,13 @@
                         <rect key="frame" x="16" y="11" width="288" height="36"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nUZ-a9-6AD">
-                                <rect key="frame" x="0.0" y="0.0" width="140" height="20.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o7x-7F-qkh">
-                                <rect key="frame" x="148" y="0.0" width="140" height="20.5"/>
+                                <rect key="frame" x="246.5" y="0.0" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.xib b/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.xib
index de745d4..bff513d 100644
--- a/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.xib
+++ b/Sentinel/Classes/Core/ToolTableItems/NavigationToolTableCell.xib
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="b6e-Ns-Obc" style="IBUITableViewCellStyleDefault" id="8z8-BE-XKd" customClass="NavigationToolTableCell" customModule="ToolBox" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="b6e-Ns-Obc" style="IBUITableViewCellStyleDefault" id="8z8-BE-XKd" customClass="NavigationToolTableCell" customModule="Sentinel">
             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8z8-BE-XKd" id="MGV-KC-d8s">
-                <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                <rect key="frame" x="0.0" y="0.0" width="385.5" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b6e-Ns-Obc">
-                        <rect key="frame" x="20" y="0.0" width="355" height="44"/>
+                        <rect key="frame" x="20" y="0.0" width="357.5" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="textColor"/>
diff --git a/Sentinel/Classes/Core/UIImage+Bundle.swift b/Sentinel/Classes/Core/UIImage+Bundle.swift
index 000bd34..0d5d666 100644
--- a/Sentinel/Classes/Core/UIImage+Bundle.swift
+++ b/Sentinel/Classes/Core/UIImage+Bundle.swift
@@ -13,7 +13,13 @@ extension UIImage {
         let frameworkBundle = Bundle(for: Sentinel.self)
         guard let frameworkURL = frameworkBundle.resourceURL else { return nil }
         let bundleURL = frameworkURL.appendingPathComponent("Sentinel.bundle")
+
+        #if SWIFT_PACKAGE
+        let resourceBundle = Bundle.sentinel
+        #else
         let resourceBundle = Bundle(url: bundleURL)
+        #endif
+        
         return UIImage(named: name, in: resourceBundle, compatibleWith: nil)
     }
 }
diff --git a/Sentinel/Classes/TextEditing/TextEditing.storyboard b/Sentinel/Classes/TextEditing/TextEditing.storyboard
index 4c728aa..9591c9d 100644
--- a/Sentinel/Classes/TextEditing/TextEditing.storyboard
+++ b/Sentinel/Classes/TextEditing/TextEditing.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uEM-np-6oE">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uEM-np-6oE">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -27,7 +28,7 @@
         <!--Text Editing View Controller-->
         <scene sceneID="6OI-kd-s4k">
             <objects>
-                <viewController storyboardIdentifier="TextEditingViewController" id="lh4-jV-G3x" customClass="TextEditingViewController" customModule="ToolBox" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="TextEditingViewController" id="lh4-jV-G3x" customClass="TextEditingViewController" customModule="Sentinel" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="rQg-Ji-zjo">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -43,23 +44,23 @@
                                     </label>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="5aM-iS-Oq8">
                                         <rect key="frame" x="0.0" y="36.5" width="382" height="755.5"/>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
-                                        <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" systemColor="labelColor"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                     </textView>
                                 </subviews>
                             </stackView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="PZu-Su-pIc"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="PZu-Su-pIc" firstAttribute="trailing" secondItem="Y6g-VO-MRq" secondAttribute="trailing" constant="16" id="2vJ-ba-hYz"/>
                             <constraint firstAttribute="bottom" secondItem="Y6g-VO-MRq" secondAttribute="bottom" id="Thj-ua-PpG"/>
                             <constraint firstItem="Y6g-VO-MRq" firstAttribute="leading" secondItem="PZu-Su-pIc" secondAttribute="leading" constant="16" id="nsc-36-UkU"/>
                             <constraint firstItem="Y6g-VO-MRq" firstAttribute="top" secondItem="PZu-Su-pIc" secondAttribute="top" constant="16" id="rh7-cD-cdd"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="PZu-Su-pIc"/>
                     </view>
                     <navigationItem key="navigationItem" id="D2o-XF-2ZA">
                         <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="FuM-WR-ZlS">
@@ -78,4 +79,12 @@
             <point key="canvasLocation" x="-165" y="149"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="labelColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

From b715355f54b225b30bb753225ac6cefd5753328f Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Thu, 4 Aug 2022 09:12:35 +0200
Subject: [PATCH 4/7] Update Loggie and Collar dependencies for SPM to a
 separate library

---
 Package.swift                            | 27 ++++++++++++++++++++++--
 Sentinel.podspec                         |  2 +-
 Sentinel/Classes/Collar/CollarTool.swift |  3 +++
 Sentinel/Classes/Loggie/LoggieTool.swift |  3 +++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/Package.swift b/Package.swift
index c4cdaf4..f234141 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,7 +11,16 @@ let package = Package(
     products: [
         .library(
             name: "Sentinel",
-            targets: ["Sentinel"])
+            targets: ["Sentinel"]
+        ),
+        .library(
+            name: "SentinelLoggie",
+            targets: ["SentinelLoggie"]
+        ),
+        .library(
+            name: "SentinelCollar",
+            targets: ["SentinelCollar"]
+        )
     ],
     dependencies: [
         .package(name: "Loggie", url: "https://github.com/infinum/iOS-Loggie.git", .upToNextMajor(from: "2.3.3")),
@@ -20,11 +29,25 @@ let package = Package(
     targets: [
         .target(
             name: "Sentinel",
-            dependencies: ["Loggie", "Collar"],
+            dependencies: [],
             path: "Sentinel",
+            exclude: [
+                "Classes/Loggie/LoggieTool.swift",
+                "Classes/Collar/CollarTool.swift"
+            ],
             resources: [
                 .process("Assets")
             ]
+        ),
+        .target(
+            name: "SentinelLoggie",
+            dependencies: ["Sentinel", "Loggie"],
+            path: "Sentinel/Classes/Loggie"
+        ),
+        .target(
+            name: "SentinelCollar",
+            dependencies: ["Sentinel", "Collar"],
+            path: "Sentinel/Classes/Collar"
         )
     ]
 )
diff --git a/Sentinel.podspec b/Sentinel.podspec
index c659e04..b1f3436 100644
--- a/Sentinel.podspec
+++ b/Sentinel.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Sentinel'
-  s.version          = '1.1.1'
+  s.version          = '1.1.2'
   s.summary          = 'Developer\'s toolbox for debugging applications'
 
   s.description      = <<-DESC
diff --git a/Sentinel/Classes/Collar/CollarTool.swift b/Sentinel/Classes/Collar/CollarTool.swift
index da9d408..c7fae81 100644
--- a/Sentinel/Classes/Collar/CollarTool.swift
+++ b/Sentinel/Classes/Collar/CollarTool.swift
@@ -6,6 +6,9 @@
 //
 
 import UIKit
+#if SWIFT_PACKAGE
+import Sentinel
+#endif
 import Collar
 
 public class CollarTool: Tool {
diff --git a/Sentinel/Classes/Loggie/LoggieTool.swift b/Sentinel/Classes/Loggie/LoggieTool.swift
index 20f835c..66cdc23 100644
--- a/Sentinel/Classes/Loggie/LoggieTool.swift
+++ b/Sentinel/Classes/Loggie/LoggieTool.swift
@@ -6,6 +6,9 @@
 //
 
 import UIKit
+#if SWIFT_PACKAGE
+import Sentinel
+#endif
 import Loggie
 
 public class LoggieTool: Tool {

From fe98d0db9643a5ad3300340feb54160d1fe89fcc Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Thu, 4 Aug 2022 09:52:23 +0200
Subject: [PATCH 5/7] Update example version

---
 Example/Podfile.lock                             | 16 ++++++++--------
 .../Pods/Local Podspecs/Sentinel.podspec.json    |  4 ++--
 Example/Pods/Manifest.lock                       | 16 ++++++++--------
 Example/Pods/Pods.xcodeproj/project.pbxproj      |  4 ++--
 .../ResourceBundle-Sentinel-Sentinel-Info.plist  |  2 +-
 .../Sentinel/Sentinel-Info.plist                 |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index a8205a9..fae6b14 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
-  - Sentinel (1.0.0):
-    - Sentinel/Default (= 1.0.0)
-  - Sentinel/Core (1.0.0)
-  - Sentinel/CustomLocation (1.0.0):
+  - Sentinel (1.1.2):
+    - Sentinel/Default (= 1.1.2)
+  - Sentinel/Core (1.1.2)
+  - Sentinel/CustomLocation (1.1.2):
     - Sentinel/Core
-  - Sentinel/Default (1.0.0):
+  - Sentinel/Default (1.1.2):
     - Sentinel/Core
     - Sentinel/CustomLocation
     - Sentinel/TextEditing
     - Sentinel/UserDefaults
-  - Sentinel/TextEditing (1.0.0):
+  - Sentinel/TextEditing (1.1.2):
     - Sentinel/Core
-  - Sentinel/UserDefaults (1.0.0):
+  - Sentinel/UserDefaults (1.1.2):
     - Sentinel/Core
 
 DEPENDENCIES:
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sentinel: 2805e6de525f8c38d828045aea0c3acd24ca487d
+  Sentinel: 35a8bf4cf907cc64866f816447ff2387e09a2a6a
 
 PODFILE CHECKSUM: b1ea13fb80f56c4238650f0da0299d23734a6421
 
diff --git a/Example/Pods/Local Podspecs/Sentinel.podspec.json b/Example/Pods/Local Podspecs/Sentinel.podspec.json
index 99e7521..63b4aee 100644
--- a/Example/Pods/Local Podspecs/Sentinel.podspec.json	
+++ b/Example/Pods/Local Podspecs/Sentinel.podspec.json	
@@ -1,6 +1,6 @@
 {
   "name": "Sentinel",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "summary": "Developer's toolbox for debugging applications",
   "description": "Sentinel is a simple library which gives developers a possibility to configure one entry point for every debug tool.\nThe idea of Sentinel is to give ability to developers to configure screen with multiple debug tools which are available via some event (e.g. shake, notification).",
   "homepage": "https://github.com/infinum/ios-sentinel",
@@ -15,7 +15,7 @@
   },
   "source": {
     "git": "https://github.com/infinum/ios-sentinel.git",
-    "tag": "1.0.0"
+    "tag": "1.1.2"
   },
   "requires_arc": true,
   "platforms": {
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
index a8205a9..fae6b14 100644
--- a/Example/Pods/Manifest.lock
+++ b/Example/Pods/Manifest.lock
@@ -1,17 +1,17 @@
 PODS:
-  - Sentinel (1.0.0):
-    - Sentinel/Default (= 1.0.0)
-  - Sentinel/Core (1.0.0)
-  - Sentinel/CustomLocation (1.0.0):
+  - Sentinel (1.1.2):
+    - Sentinel/Default (= 1.1.2)
+  - Sentinel/Core (1.1.2)
+  - Sentinel/CustomLocation (1.1.2):
     - Sentinel/Core
-  - Sentinel/Default (1.0.0):
+  - Sentinel/Default (1.1.2):
     - Sentinel/Core
     - Sentinel/CustomLocation
     - Sentinel/TextEditing
     - Sentinel/UserDefaults
-  - Sentinel/TextEditing (1.0.0):
+  - Sentinel/TextEditing (1.1.2):
     - Sentinel/Core
-  - Sentinel/UserDefaults (1.0.0):
+  - Sentinel/UserDefaults (1.1.2):
     - Sentinel/Core
 
 DEPENDENCIES:
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sentinel: 2805e6de525f8c38d828045aea0c3acd24ca487d
+  Sentinel: 35a8bf4cf907cc64866f816447ff2387e09a2a6a
 
 PODFILE CHECKSUM: b1ea13fb80f56c4238650f0da0299d23734a6421
 
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
index e584eef..d8436c6 100644
--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -583,8 +583,8 @@
 		BFDFE7DC352907FC980B868725387E98 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1240;
+				LastSwiftUpdateCheck = 1300;
+				LastUpgradeCheck = 1300;
 			};
 			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
diff --git a/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist
index e148b98..146e63e 100644
--- a/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist	
+++ b/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist	
@@ -13,7 +13,7 @@
   <key>CFBundlePackageType</key>
   <string>BNDL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>1.1.2</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
diff --git a/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist
index 2243fe6..7ea8235 100644
--- a/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist	
+++ b/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist	
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>1.1.2</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

From 9e6f189eb990ee9fc2ecf68d63d8b4eb051a7eed Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Thu, 4 Aug 2022 09:57:17 +0200
Subject: [PATCH 6/7] Fix version

---
 Sentinel.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sentinel.podspec b/Sentinel.podspec
index b1f3436..c659e04 100644
--- a/Sentinel.podspec
+++ b/Sentinel.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Sentinel'
-  s.version          = '1.1.2'
+  s.version          = '1.1.1'
   s.summary          = 'Developer\'s toolbox for debugging applications'
 
   s.description      = <<-DESC

From c6c49df4ca56ebc2874fb8cf92bddb2023ffcf92 Mon Sep 17 00:00:00 2001
From: Dejan Skledar <dejan.skledar@infinum.com>
Date: Thu, 4 Aug 2022 09:58:14 +0200
Subject: [PATCH 7/7] Fix Example version

---
 Example/Podfile.lock                             | 16 ++++++++--------
 .../Pods/Local Podspecs/Sentinel.podspec.json    |  4 ++--
 Example/Pods/Manifest.lock                       | 16 ++++++++--------
 .../ResourceBundle-Sentinel-Sentinel-Info.plist  |  2 +-
 .../Sentinel/Sentinel-Info.plist                 |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index fae6b14..2066323 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
-  - Sentinel (1.1.2):
-    - Sentinel/Default (= 1.1.2)
-  - Sentinel/Core (1.1.2)
-  - Sentinel/CustomLocation (1.1.2):
+  - Sentinel (1.1.1):
+    - Sentinel/Default (= 1.1.1)
+  - Sentinel/Core (1.1.1)
+  - Sentinel/CustomLocation (1.1.1):
     - Sentinel/Core
-  - Sentinel/Default (1.1.2):
+  - Sentinel/Default (1.1.1):
     - Sentinel/Core
     - Sentinel/CustomLocation
     - Sentinel/TextEditing
     - Sentinel/UserDefaults
-  - Sentinel/TextEditing (1.1.2):
+  - Sentinel/TextEditing (1.1.1):
     - Sentinel/Core
-  - Sentinel/UserDefaults (1.1.2):
+  - Sentinel/UserDefaults (1.1.1):
     - Sentinel/Core
 
 DEPENDENCIES:
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sentinel: 35a8bf4cf907cc64866f816447ff2387e09a2a6a
+  Sentinel: 620185762371cdd6615c4f5e21519dfa3a9ad3fd
 
 PODFILE CHECKSUM: b1ea13fb80f56c4238650f0da0299d23734a6421
 
diff --git a/Example/Pods/Local Podspecs/Sentinel.podspec.json b/Example/Pods/Local Podspecs/Sentinel.podspec.json
index 63b4aee..28c16a7 100644
--- a/Example/Pods/Local Podspecs/Sentinel.podspec.json	
+++ b/Example/Pods/Local Podspecs/Sentinel.podspec.json	
@@ -1,6 +1,6 @@
 {
   "name": "Sentinel",
-  "version": "1.1.2",
+  "version": "1.1.1",
   "summary": "Developer's toolbox for debugging applications",
   "description": "Sentinel is a simple library which gives developers a possibility to configure one entry point for every debug tool.\nThe idea of Sentinel is to give ability to developers to configure screen with multiple debug tools which are available via some event (e.g. shake, notification).",
   "homepage": "https://github.com/infinum/ios-sentinel",
@@ -15,7 +15,7 @@
   },
   "source": {
     "git": "https://github.com/infinum/ios-sentinel.git",
-    "tag": "1.1.2"
+    "tag": "1.1.1"
   },
   "requires_arc": true,
   "platforms": {
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
index fae6b14..2066323 100644
--- a/Example/Pods/Manifest.lock
+++ b/Example/Pods/Manifest.lock
@@ -1,17 +1,17 @@
 PODS:
-  - Sentinel (1.1.2):
-    - Sentinel/Default (= 1.1.2)
-  - Sentinel/Core (1.1.2)
-  - Sentinel/CustomLocation (1.1.2):
+  - Sentinel (1.1.1):
+    - Sentinel/Default (= 1.1.1)
+  - Sentinel/Core (1.1.1)
+  - Sentinel/CustomLocation (1.1.1):
     - Sentinel/Core
-  - Sentinel/Default (1.1.2):
+  - Sentinel/Default (1.1.1):
     - Sentinel/Core
     - Sentinel/CustomLocation
     - Sentinel/TextEditing
     - Sentinel/UserDefaults
-  - Sentinel/TextEditing (1.1.2):
+  - Sentinel/TextEditing (1.1.1):
     - Sentinel/Core
-  - Sentinel/UserDefaults (1.1.2):
+  - Sentinel/UserDefaults (1.1.1):
     - Sentinel/Core
 
 DEPENDENCIES:
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sentinel: 35a8bf4cf907cc64866f816447ff2387e09a2a6a
+  Sentinel: 620185762371cdd6615c4f5e21519dfa3a9ad3fd
 
 PODFILE CHECKSUM: b1ea13fb80f56c4238650f0da0299d23734a6421
 
diff --git a/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist
index 146e63e..f40fb9e 100644
--- a/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist	
+++ b/Example/Pods/Target Support Files/Sentinel/ResourceBundle-Sentinel-Sentinel-Info.plist	
@@ -13,7 +13,7 @@
   <key>CFBundlePackageType</key>
   <string>BNDL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.2</string>
+  <string>1.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
diff --git a/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist b/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist
index 7ea8235..d60f138 100644
--- a/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist	
+++ b/Example/Pods/Target Support Files/Sentinel/Sentinel-Info.plist	
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.2</string>
+  <string>1.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>