Merge pull request #1 from loopandlearn/honor-global-snooze

Honor global snooze

Author: codebymini

Config.xcconfig

@@ -6,4 +6,4 @@
 unique_id = ${DEVELOPMENT_TEAM}
 
 //Version (DEFAULT)
-LOOP_FOLLOW_MARKETING_VERSION = 2.8.3
+LOOP_FOLLOW_MARKETING_VERSION = 2.8.5

LoopFollow/Alarm/AlarmEditing/Components/AlarmAudioSection.swift

@@ -96,33 +96,39 @@ private struct TonePickerSheet: View {
 
     var body: some View {
         NavigationView {
-            List {
-                ForEach(SoundFile.allCases) { tone in
-                    Button {
-                        selected = tone
-                        AlarmSound.setSoundFile(str: tone.rawValue)
-                        AlarmSound.stop()
-                        AlarmSound.playTest()
-                    } label: {
-                        HStack {
-                            Text(tone.displayName)
-                            if tone == selected {
-                                Spacer()
-                                Image(systemName: "checkmark")
-                                    .foregroundColor(.accentColor)
+            ScrollViewReader { proxy in
+                List {
+                    ForEach(SoundFile.allCases) { tone in
+                        Button {
+                            selected = tone
+                            AlarmSound.setSoundFile(str: tone.rawValue)
+                            AlarmSound.stop()
+                            AlarmSound.playTest()
+                        } label: {
+                            HStack {
+                                Text(tone.displayName)
+                                if tone == selected {
+                                    Spacer()
+                                    Image(systemName: "checkmark")
+                                        .foregroundColor(.accentColor)
+                                }
                             }
                         }
+                        .id(tone)
                     }
                 }
-            }
-            .navigationTitle("Choose Tone")
-            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button("Done") {
-                        AlarmSound.stop()
-                        dismiss()
+                .navigationTitle("Choose Tone")
+                .toolbar {
+                    ToolbarItem(placement: .confirmationAction) {
+                        Button("Done") {
+                            AlarmSound.stop()
+                            dismiss()
+                        }
                     }
                 }
+                .onAppear {
+                    proxy.scrollTo(selected, anchor: .center)
+                }
             }
         }
     }

LoopFollow/Alarm/AlarmManager.swift

@@ -43,6 +43,17 @@ class AlarmManager {
     func checkAlarms(data: AlarmData) {
         let now = Date()
         var alarmTriggered = false
+
+        let config = Storage.shared.alarmConfiguration.value
+
+        // Honor the "Snooze All" setting. If active, stop any current alarm and exit.
+        if let snoozeUntil = config.snoozeUntil, snoozeUntil > now {
+            if Observable.shared.currentAlarm.value != nil {
+                stopAlarm()
+            }
+            return
+        }
+
         let alarms = Storage.shared.alarms.value
 
         let sorted = alarms.sorted(by: Alarm.byPriorityThenSpec)

LoopFollow/Controllers/Graphs.swift

@@ -1772,71 +1772,50 @@ extension MainViewController {
     }
 
     func wrapText(_ text: String, maxLineLength: Int) -> String {
-        return text
-        var lines: [String] = []
-        var currentLine = ""
-
-        let words = text.components(separatedBy: .whitespacesAndNewlines)
-        for word in words {
-            if word.count > maxLineLength {
-                var wordToProcess = word
-                while !wordToProcess.isEmpty {
-                    let spaceCount = currentLine.isEmpty ? 0 : 1
-                    let availableSpace = maxLineLength - (currentLine.count + spaceCount)
-
-                    if availableSpace <= 0 {
-                        if !currentLine.isEmpty {
-                            lines.append(currentLine)
-                            currentLine = ""
-                        }
-                        continue
-                    }
+        guard maxLineLength > 0 else {
+            return text
+        }
 
-                    let takeCount = min(wordToProcess.count, availableSpace)
-                    if takeCount <= 0 {
-                        if !currentLine.isEmpty {
-                            lines.append(currentLine)
-                            currentLine = ""
-                        }
-                        continue
-                    }
+        var result: [String] = []
+        let lines = text.components(separatedBy: .newlines)
 
-                    let index = wordToProcess.index(wordToProcess.startIndex, offsetBy: takeCount)
-                    let substring = wordToProcess[..<index]
+        for line in lines {
+            var currentLine = ""
+            let words = line.components(separatedBy: .whitespaces)
 
-                    if currentLine.isEmpty {
-                        currentLine = String(substring)
-                    } else {
-                        currentLine += " " + substring
+            for word in words {
+                // Handles words that are longer than a single line.
+                if word.count > maxLineLength {
+                    if !currentLine.isEmpty {
+                        result.append(currentLine)
+                        currentLine = ""
                     }
 
-                    wordToProcess = String(wordToProcess[index...])
-
-                    if currentLine.count >= maxLineLength {
-                        lines.append(currentLine)
-                        currentLine = ""
+                    var wordToSplit = word
+                    while !wordToSplit.isEmpty {
+                        let splitIndex = wordToSplit.index(wordToSplit.startIndex, offsetBy: min(maxLineLength, wordToSplit.count))
+                        result.append(String(wordToSplit[..<splitIndex]))
+                        wordToSplit = String(wordToSplit[splitIndex...])
                     }
-                }
-            } else {
-                let spaceNeeded = currentLine.isEmpty ? 0 : 1
-                if currentLine.count + spaceNeeded + word.count > maxLineLength {
-                    lines.append(currentLine)
-                    currentLine = word
                 } else {
+                    // The word fits on the line.
                     if currentLine.isEmpty {
                         currentLine = word
-                    } else {
+                    } else if currentLine.count + word.count + 1 <= maxLineLength {
                         currentLine += " " + word
+                    } else {
+                        result.append(currentLine)
+                        currentLine = word
                     }
                 }
             }
-        }
 
-        if !currentLine.isEmpty {
-            lines.append(currentLine)
+            if !currentLine.isEmpty {
+                result.append(currentLine)
+            }
         }
 
-        return lines.joined(separator: "\r\n")
+        return result.joined(separator: "\r\n")
     }
 
     func formatPillText(line1: String, time: TimeInterval, line2: String? = nil) -> String {