Converted all of my print statements to debug log entries. Few last minute bug fixes before 0.9.1 release.

Author: xan-m

Infini-iOS.xcodeproj/project.pbxproj

@@ -53,6 +53,7 @@
 		26A40E932707D119007966F6 /* BLEUpdateHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40E922707D119007966F6 /* BLEUpdateHandler.swift */; };
 		26A40E952708C7F8007966F6 /* ScanningPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40E942708C7F8007966F6 /* ScanningPopover.swift */; };
 		26A40EE8270A1F97007966F6 /* RenameDeviceHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40EE7270A1F97007966F6 /* RenameDeviceHeader.swift */; };
+		26A40EEA270A5F39007966F6 /* DFUStartButtonColorSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40EE9270A5F39007966F6 /* DFUStartButtonColorSelector.swift */; };
 		26A6314D26BEFD2C005AE404 /* MusicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A6314C26BEFD2C005AE404 /* MusicController.swift */; };
 		26A6315526C0297A005AE404 /* BLEWriteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A6315426C0297A005AE404 /* BLEWriteManager.swift */; };
 		26A6315B26C49841005AE404 /* DFU.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A6315A26C49841005AE404 /* DFU.swift */; };
@@ -143,6 +144,7 @@
 		26A40E922707D119007966F6 /* BLEUpdateHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEUpdateHandler.swift; sourceTree = "<group>"; };
 		26A40E942708C7F8007966F6 /* ScanningPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanningPopover.swift; sourceTree = "<group>"; };
 		26A40EE7270A1F97007966F6 /* RenameDeviceHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RenameDeviceHeader.swift; sourceTree = "<group>"; };
+		26A40EE9270A5F39007966F6 /* DFUStartButtonColorSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUStartButtonColorSelector.swift; sourceTree = "<group>"; };
 		26A6314C26BEFD2C005AE404 /* MusicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicController.swift; sourceTree = "<group>"; };
 		26A6315426C0297A005AE404 /* BLEWriteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEWriteManager.swift; sourceTree = "<group>"; };
 		26A6315A26C49841005AE404 /* DFU.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFU.swift; sourceTree = "<group>"; };
@@ -229,6 +231,7 @@
 				2632388526F2548600D72B43 /* DFUWithoutBLE.swift */,
 				2632388726F2576D00D72B43 /* DFUFileSelectButton.swift */,
 				2632388926F2591900D72B43 /* DFUStartTransferButton.swift */,
+				26A40EE9270A5F39007966F6 /* DFUStartButtonColorSelector.swift */,
 				2675CA5926DC81AA00967E4D /* DFUComplete.swift */,
 				263B20C626CF07BB00676BF0 /* DFUProgressBar.swift */,
 			);
@@ -617,6 +620,7 @@
 				26C5FAD526FBB76100921207 /* DeviceNameManager.swift in Sources */,
 				26A6315B26C49841005AE404 /* DFU.swift in Sources */,
 				26D7817A26CAD19F00BBF555 /* ColorPalette.swift in Sources */,
+				26A40EEA270A5F39007966F6 /* DFUStartButtonColorSelector.swift in Sources */,
 				26A40EE8270A1F97007966F6 /* RenameDeviceHeader.swift in Sources */,
 				266F53EA26FA91F3007481A6 /* DeviceInfo.swift in Sources */,
 			);

Infini-iOS/BLE/BLEDelegates.swift

@@ -29,14 +29,6 @@ extension BLEManager: CBPeripheralDelegate {
 		}
 	}
 
-	func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: Error?) {
-		if (error == nil) {
-			print("notification state updated for \(characteristic.uuid)")
-		} else {
-			print(error!.localizedDescription)
-		}
-	}
-	
 	func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
 		DeviceInfoManager().updateInfo(characteristic: characteristic)
 		BLEUpdatedCharacteristicHandler().handleUpdates(characteristic: characteristic, peripheral: peripheral)

Infini-iOS/BLE/BLEDiscoveredCharacteristics.swift

@@ -37,7 +37,6 @@ struct BLEDiscoveredCharacteristics {
 				try peripheral.writeValue(SetTime().currentTime().hexData, for: characteristic, type: .withResponse)
 			} catch {
 				bleManager.setTimeError = true
-				print("Error setting time: \(error)")
 			}
 		default:
 			break

Infini-iOS/BLE/BLEManager.swift

@@ -112,6 +112,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 			firstConnect = true
 			isConnectedToPinetime = false
 			heartChartReconnect = false
+			infiniTime = nil
 		}
 	}
 
@@ -155,7 +156,9 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 	}
 
 	func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
-		bleLogger.debug(error: error, log: .ble, date: Date()) // MARK: logging
+		if error != nil {
+			bleLogger.debug(error: "Failed to connect: \(error!)", log: .ble, date: Date()) // MARK: logging
+		}
 	}
 
 	func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
@@ -169,10 +172,10 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 			heartChartReconnect = true
 			//connect(peripheral: peripheral)
 			central.connect(peripheral)
-			bleLogger.debug(error: error, log: .ble, date: Date()) // MARK: logging
+			bleLogger.debug(error: "Peripheral disconnected. Reason: \(error!)", log: .ble, date: Date()) // MARK: logging
 		} else {
 			DeviceInfoManager.init().clearDeviceInfo()
-			bleLogger.debug(error: nil, log: .ble, additionalInfo: "User initiated disconnect", date: Date()) // MARK: logging
+			bleLogger.debug(error: "User initiated disconnect", log: .ble, date: Date()) // MARK: logging
 		}
 		UptimeManager.shared.lastDisconnect = Date()
 		UptimeManager.shared.connectTime = nil

Infini-iOS/BLE/BLEUpdateHandler.swift

@@ -41,7 +41,7 @@ struct BLEUpdatedCharacteristicHandler {
 			}
 		case bleManager.cbuuidList.bat:
 			let batData = [UInt8](characteristic.value!)
-			DebugLogManager.shared.debug(error: nil, log: .ble, additionalInfo: "battery level report: \(String(batData[0]))", date: Date())
+			DebugLogManager.shared.debug(error: "battery level report: \(String(batData[0]))", log: .ble, date: Date())
 			ChartManager.shared.addItem(dataPoint: DataPoint(date: Date(), value: Double(batData[0]), chart: ChartsAsInts.battery.rawValue))
 			bleManager.batteryLevel = Double(batData[0])
 		default:

Infini-iOS/BLE/BLEWriteManager.swift

@@ -22,10 +22,10 @@ struct BLEWriteManager {
 
 	func sendNotification(title: String, body: String) {
 		guard let titleData = ("   " + title + "\0").data(using: .ascii) else {
-			DebugLogManager.shared.debug(error: nil, log: .app, additionalInfo: "Failed to convert notification title to ASCII", date: Date())
+			DebugLogManager.shared.debug(error: "Failed to convert notification title to ASCII. Title: '\(title)'", log: .app, date: Date())
 			return }
 		guard let bodyData = (body + "\0").data(using: .ascii) else {
-			DebugLogManager.shared.debug(error: nil, log: .app, additionalInfo: "Failed to convert notification body to ASCII", date: Date())
+			DebugLogManager.shared.debug(error: "Failed to convert notification body to ASCII. Body: '\(body)'", log: .app, date: Date())
 			return }
 		var notification = titleData
 		notification.append(bodyData)

Infini-iOS/BLE/SetTime.swift

@@ -56,22 +56,14 @@ class SetTime {
 		for part in dateString.components(separatedBy: " ") {
 			debugString.append(String("\(part), "))
 			guard let intPart = Int(part) else {
-				logManager.debug(error: nil, log: .app, additionalInfo: "Failed to set date!", date: Date())
-				logManager.debug(error: nil, log: .app, additionalInfo: "Full date string: \(dateString)")
-				logManager.debug(error: nil, log: .app, additionalInfo: debugString)
-				if part.isEmpty {
-					logManager.debug(error: nil, log: .app, additionalInfo: "Tried to convert a nil value")
-				} else {
-					logManager.debug(error: nil, log: .app, additionalInfo: "'\(part)' was unable to be converted to an Integer")
-				}
+				logManager.debug(error: "Failed to set date!", log: .app, date: Date())
+				logManager.debug(error: "Full date string: \(dateString)", log: .app)
+				logManager.debug(error: "'\(part)' was unable to be converted to an Integer", log: .app)
 				throw SetTimeError.nilValue
 			}
 			let hex = String(format: "%02X", intPart)
 			fullDateString.append(hex)
-
 		}
-		
-		// print(fullDateString) // debug
 		return fullDateString
 	}
 }

Infini-iOS/ContentView.swift

@@ -68,7 +68,7 @@ struct ContentView: View {
 						.onChange(of: bleManager.batteryLevel) { bat in
 							batteryNotifications.notify(bat: Int(bat), bleManager: bleManager)
 						}
-						//.offset(x: pageSwitcher.showMenu ? geometry.size.width * 0.6 : 0)
+						.offset(x: pageSwitcher.showMenu ? geometry.size.width * 0.6 : 0)
 						.disabled(pageSwitcher.showMenu ? true : false)
 						.overlay(Group {
 							// this overlay lets you tap on the main screen to close the side menu. swiftUI requires a view that is not Color.clear and has any opacity level > 0 for tap interactions

Infini-iOS/DFU/DFU.swift

@@ -34,7 +34,10 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	func transfer() {
 		guard let url = firmwareURL else {return}
 		guard url.startAccessingSecurityScopedResource() else { return }
-		guard let selectedFirmware = DFUFirmware(urlToZipFile:url) else { return }
+		guard let selectedFirmware = DFUFirmware(urlToZipFile:url) else {
+			DebugLogManager.shared.debug(error: "Error loading firmware file. Is the file a DFU zip?", log: .dfu, date: Date())
+			return
+		}
 		let initiator = DFUServiceInitiator().with(firmware: selectedFirmware)
 
 		// Optional:
@@ -51,10 +54,10 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	}
 
 	func downloadTransfer() {
-		print("transfer function:")
-
-		
-		guard let selectedFirmware = DFUFirmware(urlToZipFile: firmwareURL) else { print("failed to load file"); return }
+		guard let selectedFirmware = DFUFirmware(urlToZipFile: firmwareURL) else {
+			DebugLogManager.shared.debug(error: "Error loading firmware file. Is the file a DFU zip?", log: .dfu, date: Date())
+			return
+		}
 
 		let initiator = DFUServiceInitiator().with(firmware: selectedFirmware)
 
@@ -83,19 +86,15 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 	// stubs added automatically.
 	func dfuStateDidChange(to state: DFUState) {
 		dfuState = state.description()
-		print(dfuState)
 		if state.rawValue == 6 {
 			transferCompleted = true
-			print(transferCompleted)
 			dfuController = nil
 			percentComplete = 0
 		}
 	}
 
 	func dfuError(_ error: DFUError, didOccurWithMessage message: String) {
-//		print("DFU Error:", message)
-		
-		DebugLogManager.shared.debug(error: nil, log: .dfu, additionalInfo: "DFU Error: \(message)", date: Date())
+		DebugLogManager.shared.debug(error: "DFU Error: \(message)", log: .dfu, date: Date())
 
 		dfuController = nil
 		transferCompleted = false
@@ -108,8 +107,7 @@ class DFU_Updater: ObservableObject, DFUServiceDelegate, DFUProgressDelegate, Lo
 
 	func logWith(_ level: LogLevel, message: String) {
 		let logManager = DebugLogManager.shared
-		logManager.debug(error: nil, log: .dfu, additionalInfo: "DFU \(level.name()): \(message)", date: nil)
-//		print("DFU \(level.name()): \(message)")
+		logManager.debug(error: "DFU \(level.name()): \(message)", log: .dfu, date: nil)
 	}
 
 

Infini-iOS/DFU/DownloadManager.swift

@@ -55,7 +55,6 @@ class DownloadManager: NSObject, ObservableObject {
 
 	func getDownloadUrls() {
 		results = []
-		print("start of json fetch. results array count: \(results.count)")
 		guard let url = URL(string: "https://api.github.com/repos/InfiniTimeOrg/InfiniTime/releases") else {
 			return
 		}
@@ -65,7 +64,6 @@ class DownloadManager: NSObject, ObservableObject {
 					let res = try JSONDecoder().decode([Result].self, from: data)
 					DispatchQueue.main.async {
 						for i in res {
-							print(i.tag_name)
 							if i.tag_name.first != "v" {
 								if UserDefaults.standard.value(forKey: "showNewDownloadsOnly") as? Bool ?? true {
 									let comparison = BLEDeviceInfo.shared.firmware.compare(i.tag_name, options: .numeric)
@@ -80,13 +78,10 @@ class DownloadManager: NSObject, ObservableObject {
 						self.updateAvailable = self.checkForUpdates()
 					}
 				} catch {
-					print("urlsession catch")
-					print(error)
-					
+					DebugLogManager.shared.debug(error: "JSON Decoding Error: \(error)", log: .app, date: Date())
 				}
 			}
 		}.resume()
-		print("end of json fetch")
 	}
 
 	func chooseAsset(response: Result) -> Asset {
@@ -117,8 +112,6 @@ class DownloadManager: NSObject, ObservableObject {
 
 extension DownloadManager: URLSessionDelegate, URLSessionDownloadDelegate {
 	func urlSession(_: URLSession, downloadTask: URLSessionDownloadTask, didWriteData _: Int64, totalBytesWritten _: Int64, totalBytesExpectedToWrite _: Int64) {
-		// uncomment for progress updates in console
-		//print("Progress " + String(downloadTask.progress.fractionCompleted))
 	}
 
 	func urlSession(_: URLSession, downloadTask: URLSessionDownloadTask, didFinishDownloadingTo location: URL) {
@@ -131,15 +124,14 @@ extension DownloadManager: URLSessionDelegate, URLSessionDownloadDelegate {
 			// check for existing file and delete it if there is anything.
 			if FileManager.default.fileExists(atPath: savedURL.path) {
 				try? FileManager.default.removeItem(at: savedURL)
-				print("old file deleted")
 			}
 
 			// move downloaded file out of ephemeral storage and tell DFU where to look
 			try FileManager.default.moveItem(at: location, to: savedURL)
 			DFU_Updater.shared.firmwareURL = savedURL
 
 			} catch let fmerror {
-				print("filesystem error: \(fmerror)")
+				DebugLogManager.shared.debug(error: "Error saving downloaded firmware file: \(fmerror)", log: .app, date: Date())
 				// handle filesystem error
 			}
 		DispatchQueue.main.async {
@@ -149,10 +141,7 @@ extension DownloadManager: URLSessionDelegate, URLSessionDownloadDelegate {
 
 	func urlSession(_: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
 		if let error = error {
-			print("Download error: %@" + String(describing: error))
-//		uncomment to print that it finished
-//		} else {
-//			print("Task finished: %@" )//+ task)
+			DebugLogManager.shared.debug(error: "Download error: \(String(describing: error))", log: .app, date: Date())
 		}
 	}
 }