Clean up

Author: liamcharger

.DS_Store

@@ -153,10 +153,3 @@ struct StepChartView: View {
         }
     }
 }
-
-extension Date {
-    static func from(year: Int, month: Int, day: Int) -> Date {
-        let components = DateComponents(year: year, month: month, day: day)
-        return Calendar.current.date(from: components)!
-    }
-}

InfiniLink/Core/Components/Charts/StepChartView.swift

@@ -95,7 +95,6 @@ struct DetailHeaderView<V: View>: View {
                     Image(systemName: header.icon)
                         .foregroundStyle(header.accent)
                         .font(.system(size: min(width / 4.4, 115)))
-                        .shadow(color: header.accent.opacity(0.7), radius: isHeartAnimating ? 20 : 0, x: 0, y: 0)
                         .scaleEffect(isHeartAnimating ? 0.85 : 1.0)
                         .animation(
                             .snappy(duration: 0.9)

InfiniLink/Core/Components/DetailHeaderView.swift

@@ -63,7 +63,7 @@ struct NotificationsSettingsView: View {
                  Toggle("Stand-up Reminder", isOn: $standUpReminder)
                  }
                  */
-                Section(footer: Text("Get a notification whenn your heart rate goes above or below the specified range.")) {
+                Section(footer: Text("Get a notification when your heart rate goes above or below the specified range.")) {
                     Toggle("Heart Range Notifications", isOn: $heartRangeReminder)
                     if heartRangeReminder {
                         HStack {

InfiniLink/Core/Settings/Notifications/NotificationsSettingsView.swift

@@ -30,19 +30,19 @@ struct StepsView: View {
     var body: some View {
         GeometryReader { geo in
             List {
-                    Section {
-                        DetailHeaderView(Header(title: steps(for: Date()), subtitle: String(deviceManager.settings.stepsGoal), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
-                            HStack {
-                                DetailHeaderSubItemView(title: "Dis",
-                                                        value: String(format: "%.2f", exerciseCalculator.calculateDistance(steps: bleManager.stepCount)),
-                                                        unit: personalizationController.units == .imperial ? "mi" : "m")
-                                DetailHeaderSubItemView(title: "Kcal", value: String(format: "%.1f", exerciseCalculator.calculateCaloriesBurned(steps: bleManager.stepCount)))
-                            }
+                Section {
+                    DetailHeaderView(Header(title: steps(for: Date()), subtitle: String(deviceManager.settings.stepsGoal), units: "Steps", icon: "figure.walk", accent: .blue), width: geo.size.width) {
+                        HStack {
+                            DetailHeaderSubItemView(title: "Dis",
+                                                    value: String(format: "%.2f", exerciseCalculator.calculateDistance(steps: bleManager.stepCount)),
+                                                    unit: personalizationController.units == .imperial ? "mi" : "m")
+                            DetailHeaderSubItemView(title: "Kcal", value: String(format: "%.1f", exerciseCalculator.calculateCaloriesBurned(steps: bleManager.stepCount)))
                         }
-                        .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                        .listRowBackground(Color.clear)
                     }
-                    StepChartView()
+                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                    .listRowBackground(Color.clear)
+                }
+                StepChartView()
             }
         }
         .navigationTitle("Steps")

InfiniLink/Core/StepsView.swift

@@ -41,6 +41,11 @@ extension Date {
 
         return calendar.date(from: components) ?? Date()
     }
+    
+    static func from(year: Int, month: Int, day: Int) -> Date {
+        let components = DateComponents(year: year, month: month, day: day)
+        return Calendar.current.date(from: components)!
+    }
 }
 
 func date(year: Int, month: Int, day: Int = 1, hour: Int = 0, minutes: Int = 0, seconds: Int = 0) -> Date {

InfiniLink/Date+Extension.swift

@@ -422,7 +422,7 @@
     "General" : {
 
     },
-    "Get a notification whenn your heart rate goes above or below the specified range." : {
+    "Get a notification when your heart rate goes above or below the specified range." : {
 
     },
     "Get notifications on your watch when you reach goals, when it's time to drink water, and more." : {

InfiniLink/Localizable.xcstrings

@@ -92,14 +92,8 @@ class MusicController {
 
 
     func getCurrentSongInfo() -> SongInfo {
-        var currentSongInfo: SongInfo = SongInfo(trackName: "", artistName: "")
-        
-        DispatchQueue.main.async {
-            let currentTrack = self.musicPlayer.nowPlayingItem
-            currentSongInfo = SongInfo(trackName: currentTrack?.title ?? "Not Playing", artistName: currentTrack?.artist ?? "")
-        }
-        
-        return currentSongInfo
+        let currentTrack = self.musicPlayer.nowPlayingItem
+        return SongInfo(trackName: currentTrack?.title ?? "Not Playing", artistName: currentTrack?.artist ?? "")
     }
 
     func updateMusicInformation(songInfo: MusicController.SongInfo) {
@@ -110,7 +104,8 @@ class MusicController {
         bleWriteManager.writeToMusicApp(message: songInfo.trackName, characteristic: bleManager.musicChars.track)
         bleWriteManager.writeToMusicApp(message: songInfo.artistName, characteristic: bleManager.musicChars.artist)
 
-        var playbackTime = musicPlayer.currentPlaybackTime; if playbackTime == musicPlayer.nowPlayingItem?.playbackDuration {playbackTime = 0.0}
+        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)
 
@@ -122,7 +117,7 @@ class MusicController {
     }
 
     func convertTime(value: Double) -> [UInt8] {
-        let val32 : UInt32 = UInt32(floor(value))
+        let val32: UInt32 = UInt32(floor(value))
 
         let byte1 = UInt8(val32 & 0x000000FF)
         let byte2 = UInt8((val32 & 0x0000FF00) >> 8)