Close speak language dialog on selection

LoopFollow/Controllers/Alarms.swift

@@ -977,6 +977,14 @@ extension MainViewController {
     // Speaks the current blood glucose value and the change from the previous value.
     // Repeated calls to the function within 30 seconds are prevented.
     func speakBG(currentValue: Int, previousValue: Int) {
+        let audioSession = AVAudioSession.sharedInstance()
+        do {
+            try audioSession.setCategory(.playback, mode: .default)
+            try audioSession.setActive(true)
+        } catch {
+            print("Failed to set up audio session: \(error)")
+        }
+
         // Get the current time
         let currentTime = Date()
 

LoopFollow/Controllers/Stats.swift

@@ -70,7 +70,7 @@ class StatsData {
 
         stdDev = sqrt(partialSum / Float(bgData.count))
         if UserDefaultsRepository.units.value != "mg/dL" {
-            stdDev = Float( bgUnits.toDisplayUnits( String( stdDev ) ) ) ?? 0.0;
+            stdDev = stdDev / 18
         }
 
         if UserDefaultsRepository.useIFCC.value {

LoopFollow/ViewControllers/GeneralSettingsViewController.swift

@@ -177,6 +177,13 @@ class GeneralSettingsViewController: FormViewController {
                let speakBGRow: SwitchRow! = form.rowBy(tag: "speakBG")
                return !(speakBGRow.value ?? false)
            })
+           row.presentationMode = PresentationMode.presentModally(
+            controllerProvider: ControllerProvider.callback {
+                return SelectorViewController<SelectorRow<PushSelectorCell<String>>> { _ in }
+            },
+            onDismiss: { vc in
+                vc.dismiss(animated: true)
+            })
        }.onChange { row in
            guard let value = row.value else { return }
            UserDefaultsRepository.speakLanguage.value = value

LoopFollow/ViewControllers/MainViewController.swift

@@ -469,11 +469,10 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         DispatchQueue.main.async {
         if UserDefaultsRepository.appBadge.value {
             let latestBG = String(val)
-            UIApplication.shared.applicationIconBadgeNumber = Int(bgUnits.removePeriodForBadge(bgUnits.toDisplayUnits(latestBG))) ?? val
-        } else {
-            UIApplication.shared.applicationIconBadgeNumber = 0
-        }
-//        if UserDefaultsRepository.debugLog.value { self.writeDebugLog(value: "updated badge") }
+            UIApplication.shared.applicationIconBadgeNumber = Int(bgUnits.removePeriodAndCommaForBadge(bgUnits.toDisplayUnits(latestBG))) ?? val
+            } else {
+                UIApplication.shared.applicationIconBadgeNumber = 0
+            }
         }
     }
 

LoopFollow/helpers/bgUnits.swift

@@ -12,26 +12,37 @@ import Foundation
 class bgUnits {
 
     static func toDisplayUnits(_ value: String) -> String {
+        let numberFormatter = NumberFormatter()
+        numberFormatter.numberStyle = .decimal
+
         if UserDefaultsRepository.units.value == "mg/dL" {
-            return removeDecimals(value)
+            numberFormatter.maximumFractionDigits = 0 // No decimal places for mg/dL
         } else {
-            // convert mg/dL to mmol/l
-            let floatValue : Float = Float(value)! * 0.0555
-            return String(floatValue.cleanValue)
+            numberFormatter.maximumFractionDigits = 1 // Always one decimal place for mmol/L
+            numberFormatter.minimumFractionDigits = 1 // This ensures even .0 is displayed
         }
-    }
-
-    // if a "." is contained, simply takes the left part of the string only
-    static func removeDecimals(_ value : String) -> String {
-        if !value.contains(".") {
-            return value
+
+        numberFormatter.locale = Locale.current
+
+        if let number = Float(value) {
+            if UserDefaultsRepository.units.value == "mg/dL" {
+                let numberValue = NSNumber(value: number)
+                return numberFormatter.string(from: numberValue) ?? value
+            } else {
+                let mmolValue = number / 18
+                let numberValue = NSNumber(value: mmolValue)
+                return numberFormatter.string(from: numberValue) ?? value
+            }
         }
 
-        return String(value[..<value.firstIndex(of: ".")!])
+        return value
     }
-
-    static func removePeriodForBadge(_ value: String) -> String {
-        return value.replacingOccurrences(of: ".", with: "")
+
+    static func removePeriodAndCommaForBadge(_ value: String) -> String {
+        var modifiedValue = value
+        modifiedValue = modifiedValue.replacingOccurrences(of: ".", with: "")
+        modifiedValue = modifiedValue.replacingOccurrences(of: ",", with: "")
+        return modifiedValue
     }
 }