Merge pull request #113 from NordicSemiconductor/release/5.0.3

Nick Kibish · web-flow · commit ac2d70dd223f · 2021-07-29T01:32:25.000+02:00
Release/5.0.3
diff --git a/nRF Toolbox.xcodeproj/project.pbxproj b/nRF Toolbox.xcodeproj/project.pbxproj
diff --git a/nRF Toolbox.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/nRF Toolbox.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/nRF Toolbox/CommonViews/LoggerTableView/LoggerTableView.swift b/nRF Toolbox/CommonViews/LoggerTableView/LoggerTableView.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 
 struct LogMessage {
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/DFURouter.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/DFURouter.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 import CoreBluetooth
 
 enum PresentationType {
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/DFUDocumentPicker.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/DFUDocumentPicker.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 class DocumentPicker<T>: NSObject, UIDocumentPickerDelegate {
     typealias Callback = (Result<T, Error>) -> ()
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/LogObserver.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/Utils/LogObserver.swift
@@ -31,7 +31,7 @@
 
 
 import Foundation
-import iOSDFULibrary
+import NordicDFU
 
 extension Notification.Name {
     static let newMessage = Notification.Name("newMessage")
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/DFUFileManager.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/DFUFileManager.swift
@@ -31,7 +31,7 @@
 
 
 import Foundation
-import iOSDFULibrary
+import NordicDFU
 
 protocol DFUPacket {
     var url: URL { get }
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/FileSelectorViewController.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFileSelector/FileSelectorViewController.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 class FileSelectorViewController<T>: UIViewController, AlertPresenter, UITableViewDataSource, UITableViewDelegate {
     
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Cells/DFUFirmwareSizeSchemeCell.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Cells/DFUFirmwareSizeSchemeCell.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 extension DFUFirmwareSize {
     var segments: [Segment] {
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/DFUFirmwareInfoViewController.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/DFUFirmwareInfoViewController.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 class DFUFirmwareInfoViewController: UITableViewController, AlertPresenter {
 
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Sections/DFUFirmwareSizeSection.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUFirmwareInfo/Sections/DFUFirmwareSizeSection.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 class DFUFirmwareSizeSection: DFUActionSection {
     
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateTabBarViewController.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateTabBarViewController.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 protocol DFUUpdateRouter: AnyObject {
     func showLogs()
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateViewController.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/DFUUpdateViewController.swift
@@ -31,7 +31,7 @@
 
 
 import UIKit
-import iOSDFULibrary
+import NordicDFU
 
 protocol UpgradeManager {
     func stop()
diff --git a/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/Util/LogObserver+DFU.swift b/nRF Toolbox/Profiles/DeviceFirmwareUpdate/ViewConrollers/DFUUpdate/Util/LogObserver+DFU.swift
@@ -31,7 +31,7 @@
 
 
 import Foundation
-import iOSDFULibrary
+import NordicDFU
 
 
 class DFULogObserver: LogObserver, LoggerDelegate {
diff --git a/nRF Toolbox/Profiles/HeartRateMonitor/Sections/Cells/LinearChartTableViewCell.swift b/nRF Toolbox/Profiles/HeartRateMonitor/Sections/Cells/LinearChartTableViewCell.swift
@@ -33,7 +33,7 @@
 import UIKit
 import Charts
 
-extension DateFormatter: IAxisValueFormatter {
+extension DateFormatter: AxisValueFormatter {
     public func stringForValue(_ value: Double,
                         axis: AxisBase?) -> String {
         let date = Date(timeIntervalSince1970: value)
@@ -131,7 +131,7 @@ class LinearChartTableViewCell: UITableViewCell {
         chartsView.xAxis.axisMaximum = xMax
         chartsView.xAxis.axisMinimum = first
         
-        let set = LineChartDataSet(entries: chartValues, label: nil)
+        let set = LineChartDataSet(entries: chartValues, label: "")
         set.drawCirclesEnabled = false
         set.drawValuesEnabled = false
         
diff --git a/nRF Toolbox/Profiles/UART/Model/UARTCommandModel.swift b/nRF Toolbox/Profiles/UART/Model/UARTCommandModel.swift
@@ -31,6 +31,7 @@
 
 
 import Foundation
+import UIKit.UIImage
 import AEXML
 
 protocol UARTCommandModel: Codable, XMLRepresentable, UARTMacroElement, NordicTextTableViewCellModel {
@@ -80,7 +81,7 @@ struct TextCommand: UARTCommandModel, Equatable {
         ])
     }
     
-    var title: String { text }
+    var title: String { text.split(whereSeparator: \.isNewline).joined() }
     
     var data: Data {
         text.data(using: .utf8)!
diff --git a/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift b/nRF Toolbox/Profiles/UART/NewCommand/UARTNewCommandViewController.swift
@@ -116,7 +116,9 @@ class UARTNewCommandViewController: UIViewController {
         let image = CommandImage.allCases[selectedItem]
         
         if typeSegmentControl.selectedSegmentIndex == 0 {
-            let text = textView.text.split(separator: "\n").joined(separator: self.eolSymbol())
+            let slices = textView.text.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline)
+            let text = slices.joined(separator: eolSymbol())
+            
             command = TextCommand(text: text, image: image, eol: self.eolSymbol())
         } else {
             command = DataCommand(data: Data(valueTextField.text!.hexa), image: image)
diff --git a/nRF Toolbox/Profiles/ZephyrDFU/ViewController/NotConnectedViewController/UpdateScreen/ZephyrDFUTableViewController.swift b/nRF Toolbox/Profiles/ZephyrDFU/ViewController/NotConnectedViewController/UpdateScreen/ZephyrDFUTableViewController.swift
@@ -32,7 +32,7 @@
 
 import UIKit
 import McuManager
-import iOSDFULibrary
+import NordicDFU
 
 extension FirmwareUpgradeManager: UpgradeManager {
     func stop() {
diff --git a/nRF Toolbox/Utilities/Extensions/DFU.LogLevel+Ext.swift b/nRF Toolbox/Utilities/Extensions/DFU.LogLevel+Ext.swift
@@ -30,7 +30,7 @@
 
 
 
-import iOSDFULibrary
+import NordicDFU
 
 extension LogLevel {
     var level: LogType {
