Merge branch 'master' into IDPT-715-add-baselineoffset

.gitignore

@@ -71,6 +71,7 @@ Utils/fastlane/Provisioning
 Utils/fastlane/Build
 Utils/fastlane/report.xml
 Utils/buildData
+.swiftpm
 .DS_Store
 
 # Bundler

.travis.yml

@@ -12,6 +12,7 @@ jobs:
         - cd Utils
         - make init
         - xcodebuild test -scheme Utils -workspace Utils.xcworkspace/ -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -enableCodeCoverage YES -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2' | xcpretty -c
+        - swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios12.1-simulator" -Xswiftc "-lswiftUIKit"
     - stage: Pod Lib Lint
       name: Pod Lib Lint
       script:

Package.resolved

@@ -0,0 +1,25 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "CryptoSwift",
+        "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift",
+        "state": {
+          "branch": null,
+          "revision": "39f08ac5269361a50c08ce1e2f41989bfc4b1ec8",
+          "version": "1.3.1"
+        }
+      },
+      {
+        "package": "Device",
+        "repositoryURL": "https://github.com/Alelenka/Device",
+        "state": {
+          "branch": "spm-support",
+          "revision": "df290adc142a10ef73a9b62e9f03e54d1f2f62ee",
+          "version": null
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -0,0 +1,44 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Utils",
+    platforms: [.iOS(.v11)],
+    products: [
+        .library(
+            name: "Utils",
+            targets: ["Utils"]),
+    ],
+    dependencies: [
+        .package(
+            name: "CryptoSwift",
+            url: "https://github.com/krzyzanowskim/CryptoSwift",
+            .exact("1.3.1")
+        ),
+        .package(
+            name: "Device",
+            url: "https://github.com/Alelenka/Device",
+            .branch("spm-support")
+        ),
+    ],
+    targets: [
+        .target(
+            name: "Utils",
+            dependencies: ["CryptoSwift", "Device"],
+            path: "Utils/Utils",
+            exclude: [
+                "Info.plist"
+            ]
+        ),
+        .testTarget(
+            name: "UtilsTests",
+            dependencies: ["Utils"],
+            path: "Utils/UtilsTests",
+            exclude: [
+                "Info.plist"
+            ]
+        )
+    ]
+)

Utils/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/

Utils/Utils/BrightSide/BrightSide.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 public final class BrightSide {
 

Utils/Utils/LoadingView/LoadingView.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 public protocol LoadingView: UIView {
     func setNeedAnimating(_ needAnimating: Bool)

Utils/Utils/LocalStorage/LocalStorage.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2019 Surf. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 /// Local storage based on filemanager uses cache directory
 final public class LocalStorage {
 

Utils/Utils/OTPField/DigitFieldStyle.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2019 Surf. All rights reserved.
 //
 
+import UIKit
+
 public struct DigitFieldStyle {
     public let font: UIFont
     public let activeTextColor: UIColor

Utils/Utils/OTPField/OTPFieldStyle.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2019 Surf. All rights reserved.
 //
 
+import UIKit
+
 public struct OTPFieldStyle {
     public let digitStyle: DigitFieldStyle
     public let errorTextColor: UIColor

Utils/Utils/SettingsRouter/SettingsRouter.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// Utils for opening various settings screens from the application
 public final class SettingsRouter {

Utils/Utils/UIDevice/UIDevice.swift

@@ -7,6 +7,7 @@
 //
 
 import Device
+import UIKit
 
 public extension UIDevice {
 

Utils/Utils/UIImage/UIImage+badgedImage.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 public extension UIImage {
 

Utils/Utils/UIView/UIView+XibSetup.swift

@@ -9,15 +9,14 @@
 import UIKit
 
 public extension UIView {
-    func xibSetup() {
-        let view = loadFromNib()
+    func xibSetup(bundle: Bundle) {
+        let view = loadFromNib(bundle: bundle)
         addSubview(view)
         stretch(view: view)
     }
 
-    func loadFromNib<T: UIView>() -> T {
+    func loadFromNib<T: UIView>(bundle: Bundle) -> T {
         let selfType = type(of: self)
-        let bundle = Bundle(for: selfType)
         let nibName = String(describing: selfType)
         let nib = UINib(nibName: nibName, bundle: bundle)
 
@@ -28,8 +27,7 @@ public extension UIView {
         return view
     }
 
-    static func loadFromNib<T: UIView>() -> T {
-        let bundle = Bundle(for: self)
+    static func loadFromNib<T: UIView>(bundle: Bundle) -> T {
         let nibName = String(describing: self)
         let nib = UINib(nibName: nibName, bundle: bundle)
 
@@ -40,6 +38,22 @@ public extension UIView {
         return view
     }
 
+    func xibSetup() {
+        let view = loadFromNib()
+        addSubview(view)
+        stretch(view: view)
+    }
+
+    func loadFromNib<T: UIView>() -> T {
+        let bundle = Bundle(for: type(of: self))
+        return loadFromNib(bundle: bundle)
+    }
+
+    static func loadFromNib<T: UIView>() -> T {
+        let bundle = Bundle(for: self)
+        return loadFromNib(bundle: bundle)
+    }
+
     func stretch(view: UIView) {
         view.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([

Utils/Utils/VibrationFeedbackManager/UIDevice+feedbackType.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2018 Surf. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 extension UIDevice {
     enum FeedbackType: Int {
         case base = 0

Utils/Utils/VibrationFeedbackManager/UIDevice+hasHapticFeedback.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 Surf. All rights reserved.
 //
 
+import UIKit
+
 extension UIDevice {
     // haptic feedback support guarantees that device supports taptic engine too.
     var hasHapticFeedback: Bool {

Utils/Utils/VibrationFeedbackManager/UIDevice+hasTapticEngine.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 Surf. All rights reserved.
 //
 
+import UIKit
+
 extension UIDevice {
     var hasTapticEngine: Bool {
         return feedbackType == .taptic || hasHapticFeedback

Utils/Utils/VibrationFeedbackManager/VibrationFeedbackManager.swift

@@ -7,6 +7,8 @@
 //
 
 import AudioToolbox
+import Foundation
+import UIKit
 
 /**
  *