Add developer mode options for music, improve code

Author: liamcharger

InfiniLink.xcodeproj/project.pbxproj

@@ -554,8 +554,8 @@
 		E0C7C8362CAEF6BF0043DA2D /* Core */ = {
 			isa = PBXGroup;
 			children = (
-				E05046872D136F0600FE4BCD /* Developer */,
 				E0A7C09F2CB245F70042A12D /* Components */,
+				E05046872D136F0600FE4BCD /* Developer */,
 				E059999A2CB2E55500D64E0B /* Apps */,
 				E0A7C0742CB0ECD10042A12D /* Settings */,
 				E0B85D172CB6241000D85122 /* Exercise */,

InfiniLink/Core/Developer/DeveloperView.swift

@@ -8,9 +8,14 @@
 import SwiftUI
 
 struct DeveloperView: View {
-    let bleWriteManager = BLEWriteManager()
+    @ObservedObject var bleManager = BLEManager.shared
 
     @AppStorage("useExperimentalDFU") var useExperimentalDFU = false
+    @AppStorage("includeTestArtist") var includeTestArtist = true
+    @AppStorage("includeTestSongName") var includeTestSongName = true
+    
+    private let bleWriteManager = BLEWriteManager()
+    private let musicController = MusicController.shared
 
     var body: some View {
         List {
@@ -19,7 +24,7 @@ struct DeveloperView: View {
                     DebugLogsView()
                 }
             }
-            Section {
+            Section("Test Data") {
                 Button("Test Weather") {
                     bleWriteManager.writeForecastWeatherData(minimumTemperature: {
                         var mins = [Double]()
@@ -51,8 +56,27 @@ struct DeveloperView: View {
                 Button("Test Navigation") {
                     bleWriteManager.writeNavigationUpdate()
                 }
-            } header: {
-                Text("Test Data")
+            }
+            Section {
+                Button("Test Music") {
+                    if let playbackChar = bleManager.musicChars.position, let durationChar = bleManager.musicChars.length, let statusChar = bleManager.musicChars.status {
+                        bleWriteManager.writeHexToMusicApp(message: musicController.convertTime(value: 78), characteristic: playbackChar)
+                        bleWriteManager.writeHexToMusicApp(message: musicController.convertTime(value: 147), characteristic: durationChar)
+                        
+                        bleWriteManager.writeHexToMusicApp(message: Bool.random() ? [0x01] : [0x00], characteristic: statusChar)
+                    }
+                    
+                    if let artistChar = bleManager.musicChars.artist, includeTestArtist {
+                        bleWriteManager.writeToMusicApp(message: "Artist Name", characteristic: artistChar)
+                    }
+                    if let trackChar = bleManager.musicChars.track, includeTestSongName {
+                        bleWriteManager.writeToMusicApp(message: "Song Name", characteristic: trackChar)
+                    }
+                }
+            }
+            Section {
+                Toggle("Include Song Name", isOn: $includeTestSongName)
+                Toggle("Include Artist", isOn: $includeTestArtist)
             } footer: {
                 Text("Send randomly generated data to the various characteristics on the watch.")
             }

InfiniLink/Localizable.xcstrings

@@ -487,6 +487,12 @@
     },
     "Imperial" : {
 
+    },
+    "Include Artist" : {
+
+    },
+    "Include Song Name" : {
+
     },
     "InfiniLink " : {
 
@@ -709,6 +715,9 @@
     },
     "Test Data" : {
 
+    },
+    "Test Music" : {
+
     },
     "Test Navigation" : {
 

InfiniLink/Utils/MusicController.swift

@@ -21,8 +21,8 @@ class MusicController {
     let volumeSlots: Float = 15.0
 
     struct SongInfo {
-        var trackName: String!
-        var artistName: String!
+        var trackName: String = ""
+        var artistName: String = ""
     }
 
     enum MusicState {
@@ -100,12 +100,15 @@ class MusicController {
         let bleWriteManager = BLEWriteManager()
 
         let songInfo = getCurrentSongInfo()
+        var playbackTime = musicPlayer.currentPlaybackTime
+        if playbackTime == musicPlayer.nowPlayingItem?.playbackDuration {
+            // The playback time will be the duration of the song if it just started, so set it to zero
+            playbackTime = 0.0
+        }
 
         bleWriteManager.writeToMusicApp(message: songInfo.trackName, characteristic: bleManager.musicChars.track)
         bleWriteManager.writeToMusicApp(message: songInfo.artistName, characteristic: bleManager.musicChars.artist)
 
-        var playbackTime = musicPlayer.currentPlaybackTime
-        
         bleWriteManager.writeHexToMusicApp(message: convertTime(value: playbackTime), characteristic: bleManager.musicChars.position)
         bleWriteManager.writeHexToMusicApp(message: convertTime(value: musicPlayer.nowPlayingItem?.playbackDuration ?? 0.0), characteristic: bleManager.musicChars.length)