Improve onboarding views and fix bugs

Author: liamcharger

InfiniLink/BLE/BLEManager.swift

@@ -129,6 +129,8 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
     }
 
     func scanForNewDevices() {
+        guard !isScanning else { return }
+        
         central.scanForPeripherals(withServices: nil, options: nil)
         newPeripherals = []
         isScanning = true

InfiniLink/Core/DeviceView.swift

@@ -21,6 +21,8 @@ struct DeviceView: View {
 
     @AppStorage("sleepGoal") var sleepGoal = 28800
     @AppStorage("enableDeveloperMode") var enableDeveloperMode = false
+    @AppStorage("enableReminders") var enableReminders = true
+    @AppStorage("enableCalendarNotifications") var enableCalendarNotifications = true
 
     @Environment(\.colorScheme) var colorScheme
 
@@ -280,8 +282,16 @@ struct DeviceView: View {
                 bleManager.pairedDevice = deviceManager.fetchDevice()
 
                 notificationManager.setWaterRemindersPerDay()
-                remindersManager.requestAccess()
-                remindersManager.fetchAllItems()
+                
+                if !personalizationController.showSetupSheet {
+                    // We've already gone through the inital setup and the user has enabled reminder/calendar notifications so set state and fetch the events
+                    if enableReminders {
+                        remindersManager.requestReminderAccess()
+                    }
+                    if enableCalendarNotifications {
+                        remindersManager.requestCalendarAccess()
+                    }
+                }
             }
             .onChange(of: bleManager.weatherCharacteristic) { _ in
                 WeatherController.shared.fetchWeatherData()

InfiniLink/Core/Exercise/Views/AllExercisesView.swift

@@ -50,7 +50,7 @@ struct AllExercisesView: View {
     var body: some View {
         List {
             Section {
-                if filteredExercises.isEmpty {
+                if filteredExercises.isEmpty && !searchText.trimmingCharacters(in: .whitespaces).isEmpty {
                     Text("Nothing matched your search. Ensure your spelling is correct and try again.")
                 } else {
                     ForEach(filteredExercises.sorted(by: { $0.startDate ?? Date() > $1.startDate ?? Date() })) { userExercise in

InfiniLink/Core/Settings/BatterySettingsView.swift

@@ -49,16 +49,18 @@ struct BatterySettingsView: View {
                 }
                 .listRowBackground(Color.clear)
                 .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                Section(footer: Text("Send a notification to your devices when your watch is on low battery.")) {
-                    Toggle("Notify on Low Battery", isOn: $sendLowBatteryNotification)
-                }
-                if sendLowBatteryNotification {
-                    Section(footer: watchNotifications ? nil : Text("Watch notifications are currently disabled.")) {
-                        Toggle("Send to iPhone", isOn: $sendLowBatteryNotificationToiPhone)
-                        Toggle("Send to Watch", isOn: $sendLowBatteryNotificationToWatch)
-                            .disabled(!watchNotifications)
+                Group {
+                    Section(footer: watchNotifications ? Text("Send a notification to your devices when your watch is on low battery.") : Text("Watch notifications are currently disabled.")) {
+                        Toggle("Notify on Low Battery", isOn: watchNotifications ? $sendLowBatteryNotification : .constant(false))
+                    }
+                    if sendLowBatteryNotification && watchNotifications {
+                        Section {
+                            Toggle("Send to iPhone", isOn: $sendLowBatteryNotificationToiPhone)
+                            Toggle("Send to Watch", isOn: $sendLowBatteryNotificationToWatch)
+                        }
                     }
                 }
+                .disabled(!watchNotifications)
             }
         }
         .navigationTitle("Battery")

InfiniLink/Core/Welcome/SetUpDetailsView.swift

@@ -19,6 +19,16 @@ struct SetUpDetailsView: View {
 
     let list: Bool
 
+    func resetFields() {
+        personalizationController.weight = nil
+        personalizationController.height = nil
+        weight = ""
+        height = ""
+    }
+    func filteredUnit(_ unit: Double) -> String {
+        String(unit).replacingOccurrences(of: ".0", with: "")
+    }
+    
     init(list: Bool = false) {
         self.list = list
     }
@@ -30,7 +40,6 @@ struct SetUpDetailsView: View {
             NavigationStack {
                 content
             }
-            .navigationViewStyle(.stack)
         }
     }
 
@@ -57,11 +66,7 @@ struct SetUpDetailsView: View {
                         Text("Imperial").tag(PersonalizationController.Unit.imperial)
                     }
                     .onChange(of: personalizationController.units) { _ in
-                        personalizationController.weight = nil
-                        personalizationController.height = nil
-                        
-                        weight = ""
-                        height = ""
+                        resetFields()
                     }
                 }
                 Section {
@@ -102,20 +107,17 @@ struct SetUpDetailsView: View {
             .keyboardType(.decimalPad)
             if !list {
                 Button {
-                    // Go to next view
                     nextViewActive = true
 
-                    // Is this handled by the onDisappear?
-                    personalizationController.height = Double(height)
-                    personalizationController.weight = Double(weight)
+                    // We don't need to assign any vars here because it's handled by the onDisappear
                 } label: {
                     Text("Next")
                         .padding()
-                        .font(.body.weight(.semibold))
+                        .fontWeight(.semibold)
                         .frame(maxWidth: .infinity)
                         .background(Color.blue)
                         .foregroundStyle(.white)
-                        .clipShape(RoundedRectangle(cornerRadius: 20))
+                        .clipShape(.rect(cornerRadius: 20))
                 }
                 .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
                 .listRowBackground(Color.clear)
@@ -127,18 +129,19 @@ struct SetUpDetailsView: View {
         }
         .interactiveDismissDisabled()
         .toolbar {
-            if !list {
+            // Don't show the button if the user has edited anything
+            if !list && weight == filteredUnit(personalizationController.calculatedWeight) && height == filteredUnit(personalizationController.calculatedHeight) {
                 Button("Skip") {
                     nextViewActive = true
                 }
             }
         }
         .onAppear {
             if let weight = personalizationController.weight, weight > 0 {
-                self.weight = String(personalizationController.calculatedWeight)
+                self.weight = filteredUnit(personalizationController.calculatedWeight)
             }
             if let height = personalizationController.height, height > 0 {
-                self.height = String(personalizationController.calculatedHeight)
+                self.height = filteredUnit(personalizationController.calculatedHeight)
             }
         }
         .onDisappear {
@@ -162,6 +165,8 @@ struct NotificationsSetupView: View {
     @AppStorage("enableReminders") var enableReminders = true
     @AppStorage("enableCalendarNotifications") var enableCalendarNotifications = true
     @AppStorage("remindOnStepGoalCompletion") var remindOnStepGoalCompletion = true
+    @AppStorage("heartRangeReminder") var heartRangeReminder = false
+    @AppStorage("sendLowBatteryNotification") var sendLowBatteryNotification = true
 
     var body: some View {
         Form {
@@ -177,19 +182,31 @@ struct NotificationsSetupView: View {
             .multilineTextAlignment(.center)
             .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
             .listRowBackground(Color.clear)
-            Section("Health") {
+            Section(header: Text("Health"), footer: Text("Receive a reminder to drink water for the set amount of times a day.") + Text(" You can customize this in notification settings.")) {
                 Toggle("Water Reminder", isOn: $waterReminder)
             }
+            Section(footer: Text("Get a notification when your heart rate goes above or below the specified range.") + Text(" You can customize this in notification settings.")) {
+                Toggle("Heart Range Notifications", isOn: $heartRangeReminder)
+            }
             Section(header: Text("Daily Goals"), footer: Text("Get notified when you reach your daily fitness goals.")) {
                 Toggle("Steps", isOn: $remindOnStepGoalCompletion)
             }
+            Section(header: Text("Battery"), footer: Text("Get notified when your watch's battery is low.")) {
+                Toggle("Notify on Low Battery", isOn: $sendLowBatteryNotification)
+            }
             Section(header: Text("Other"), footer: Text("Receive notifications on your watch when reminders and calendar events are due.")) {
                 Toggle("Reminder Notifications", isOn: $enableReminders)
                 Toggle("Calendar Notifications", isOn: $enableCalendarNotifications)
             }
             Button {
                 notificationManager.requestNotificationAuthorization()
-                remindersManager.requestAccess()
+                
+                if enableReminders {
+                    remindersManager.requestReminderAccess()
+                }
+                if enableCalendarNotifications {
+                    remindersManager.requestCalendarAccess()
+                }
 
                 personalizationController.showSetupSheet = false
             } label: {

InfiniLink/Localizable.xcstrings

@@ -32,6 +32,9 @@
     },
     " step goal streak!" : {
 
+    },
+    " You can customize this in notification settings." : {
+
     },
     "-" : {
       "localizations" : {
@@ -702,6 +705,9 @@
     },
     "Get notified when you reach your daily fitness goals." : {
 
+    },
+    "Get notified when your watch's battery is low." : {
+
     },
     "GitHub Actions" : {
 

InfiniLink/Utils/MusicController.swift

@@ -13,12 +13,10 @@ import SwiftUI
 class MusicController {
     static let shared = MusicController()
 
-    let bleManager = BLEManager.shared
-    
-    var musicPlayer = MPMusicPlayerController.systemMusicPlayer
-    var musicPlaying = 0
-    
-    let volumeSlots: Float = 15.0
+    private let bleManager = BLEManager.shared
+    private let volumeNotch: Float = 0.1
+    private var musicPlayer = MPMusicPlayerController.systemMusicPlayer
+    private var musicPlaying = 0
 
     struct SongInfo {
         var trackName: String = ""
@@ -32,7 +30,7 @@ class MusicController {
     @AppStorage("allowMusicControl") var allowMusicControl = true
     @AppStorage("allowVolumeControl") var allowVolumeControl = true
 
-    private init() {
+    init() {
         initialize()
     }
 
@@ -73,15 +71,9 @@ class MusicController {
             case 4:
                 musicPlayer.skipToPreviousItem()
             case 5:
-                if allowVolumeControl {
-                    let newVolume = min(session.outputVolume + (1 / volumeSlots), 1.0)
-                    MPVolumeView.setVolume(newVolume)
-                }
+                changeVolume(up: true)
             case 6:
-                if allowVolumeControl {
-                    let newVolume = max(session.outputVolume - (1 / volumeSlots), 0.0)
-                    MPVolumeView.setVolume(newVolume)
-                }
+                changeVolume(up: false)
             default:
                 break
             }
@@ -90,6 +82,17 @@ class MusicController {
         }
     }
 
+    func changeVolume(up: Bool) {
+        guard allowVolumeControl else { return }
+        
+        let session = AVAudioSession.sharedInstance()
+        let sessionVolume = session.outputVolume // FIXME: session.outputVolume is always 1
+        
+        print(session.outputVolume)
+        
+        let volume = up ? min(sessionVolume + volumeNotch, 1.0) : max(sessionVolume - volumeNotch, 0.0)
+        MPVolumeView.setVolume(volume)
+    }
 
     func getCurrentSongInfo() -> SongInfo {
         let currentTrack = self.musicPlayer.nowPlayingItem
@@ -140,7 +143,7 @@ extension MPVolumeView {
         let volumeView = MPVolumeView()
         let slider = volumeView.subviews.first(where: { $0 is UISlider }) as? UISlider
 
-        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.01) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
             slider?.value = volume
         }
     }

InfiniLink/Utils/PersonalizationController.swift

@@ -26,12 +26,19 @@ class PersonalizationController: ObservableObject {
 
     @AppStorage("showSetupSheet") var showSetupSheet = true
 
+    private let avgMaleWeight: Double = 68.039
+    private let avgFemaleWeight: Double = 54.43
+    private let avgMaleHeight: Double = 175.26
+    private let avgFemaleHeight: Double = 162.56
+    
     var isPersonalizationAvailable: Bool {
         !showSetupSheet && (weight != nil || height != nil)
     }
 
     var calculatedWeight: Double {
-        guard let weight = self.weight, weight > 0 else { return gender == .male ? 68.039 : 54.43 }
+        guard let weight = self.weight, weight > 0 else {
+            return gender == .male ? avgMaleWeight : avgFemaleWeight
+        }
 
         if units == .imperial {
             // Convert from kg to lbs
@@ -42,7 +49,9 @@ class PersonalizationController: ObservableObject {
     }
 
     var calculatedHeight: Double {
-        guard let height = self.height, height > 0 else { return gender == .male ? 175.26 : 162.56 }
+        guard let height = self.height, height > 0 else {
+            return gender == .male ? avgMaleHeight : avgFemaleHeight
+        }
 
         if units == .imperial {
             // Convert from cm to in

InfiniLink/Utils/RemindersManager.swift

@@ -91,33 +91,29 @@ class RemindersManager: ObservableObject {
     }
 
     func requestReminderAccess() {
-        eventStore.requestAccess(to: .reminder) { granted, error in
-            if let error = error {
-                log("Unknown error while requesting reminder access: \(error.localizedDescription)", caller: "RemindersManager")
-            } else if granted {
-                DispatchQueue.main.async {
-                    self.areRemindersAuthorized = true
-                    self.fetchAllItems()
-                }
-            }
+        eventStore.requestAccess(to: .reminder) {
+            self.onAccessRequest($0, $1, reminder: true)
         }
     }
 
     func requestCalendarAccess() {
-        eventStore.requestAccess(to: .event) { granted, error in
-            if let error = error {
-                log("Unknown error while requesting calendar access: \(error.localizedDescription)", caller: "RemindersManager")
-            } else if granted {
-                DispatchQueue.main.async {
+        eventStore.requestAccess(to: .event) {
+            self.onAccessRequest($0, $1, reminder: false)
+        }
+    }
+    
+    func onAccessRequest(_ granted: Bool, _ error: Error?, reminder: Bool) {
+        if let error = error {
+            log("Unknown error while requesting \(reminder ? "reminder" : "calendar") access: \(error.localizedDescription)", caller: "RemindersManager")
+        } else if granted {
+            DispatchQueue.main.async {
+                if reminder {
+                    self.areRemindersAuthorized = true
+                } else {
                     self.areEventsAuthorized = true
-                    self.fetchAllItems()
                 }
+                self.fetchAllItems()
             }
         }
     }
-    
-    func requestAccess() {
-        requestReminderAccess()
-        requestCalendarAccess()
-    }
 }