Cleanup: debug options

LoopFollow/Controllers/NightScout.swift

@@ -499,12 +499,11 @@ extension MainViewController {
                                 }
                                 i += 1
                             }
-                        }
-                        let predMin = prediction.min()
-                        let predMax = prediction.max()
-                        tableData[9].value = bgUnits.toDisplayUnits(String(predMin!)) + "/" + bgUnits.toDisplayUnits(String(predMax!))
-                        
-                        if UserDefaultsRepository.graphPrediction.value {
+                            
+                            let predMin = prediction.min()
+                            let predMax = prediction.max()
+                            tableData[9].value = bgUnits.toDisplayUnits(String(predMin!)) + "/" + bgUnits.toDisplayUnits(String(predMax!))
+                            
                             updatePredictionGraph()
                         }
                     }
@@ -1466,9 +1465,9 @@ extension MainViewController {
                 suspendGraphData.append(dot)
             }
         }
-        
+        if UserDefaultsRepository.graphOtherTreatments.value {
         updateSuspendGraph()
-        
+        }
         
     }
     
@@ -1508,9 +1507,9 @@ extension MainViewController {
                 resumeGraphData.append(dot)
             }
         }
-        
+        if UserDefaultsRepository.graphOtherTreatments.value {
         updateResumeGraph()
-        
+        }
         
     }
     
@@ -1550,9 +1549,9 @@ extension MainViewController {
                 sensorStartGraphData.append(dot)
             }
         }
-        
+        if UserDefaultsRepository.graphOtherTreatments.value {
         updateSensorStart()
-        
+        }
         
     }
     
@@ -1594,9 +1593,9 @@ extension MainViewController {
                 noteGraphData.append(dot)
             }
         }
-        
+        if UserDefaultsRepository.graphOtherTreatments.value {
         updateNotes()
-        
+        }
         
     }
     
@@ -1642,7 +1641,7 @@ extension MainViewController {
             
         }
         
-        if UserDefaultsRepository.graphCarbs.value {
+        if UserDefaultsRepository.graphOtherTreatments.value {
             updateBGCheckGraph()
         }
         
@@ -1711,8 +1710,9 @@ extension MainViewController {
             
             
         }
-        
+        if UserDefaultsRepository.graphOtherTreatments.value {
         updateOverrideGraph()
+        }
         
     }
 }

LoopFollow/ViewControllers/DebugSettingsViewController.swift

@@ -12,109 +12,77 @@ import EventKit
 import EventKitUI
 
 class DebugSettingsViewController: FormViewController {
-
-   var appStateController: AppStateController?
-   
-   override func viewDidLoad()  {
-      super.viewDidLoad()
-      if UserDefaultsRepository.forceDarkMode.value {
-         overrideUserInterfaceStyle = .dark
-      }
-      buildDebugSettings()
-   }
-   private func buildDebugSettings() {
+    
+    var appStateController: AppStateController?
+    
+    override func viewDidLoad()  {
+        super.viewDidLoad()
+        if UserDefaultsRepository.forceDarkMode.value {
+            overrideUserInterfaceStyle = .dark
+        }
+        buildDebugSettings()
+    }
+    private func buildDebugSettings() {
         form
             +++ Section("Debug Settings")
-
+            
             <<< SwitchRow("downloadTreatments"){ row in
                 row.title = "Download Treatments"
                 row.value = UserDefaultsRepository.downloadTreatments.value
             }.onChange { [weak self] row in
-                        guard let value = row.value else { return }
-                        UserDefaultsRepository.downloadTreatments.value = value
-                }
-        <<< SwitchRow("downloadBasal"){ row in
-            row.title = "Download Basal"
-            row.value = UserDefaultsRepository.downloadBasal.value
-        }.onChange { [weak self] row in
-                    guard let value = row.value else { return }
-                    UserDefaultsRepository.downloadBasal.value = value
+                guard let value = row.value else { return }
+                UserDefaultsRepository.downloadTreatments.value = value
+            }
+            <<< SwitchRow("downloadPrediction"){ row in
+                row.title = "Download Prediction"
+                row.value = UserDefaultsRepository.downloadPrediction.value
+            }.onChange { [weak self] row in
+                guard let value = row.value else { return }
+                UserDefaultsRepository.downloadPrediction.value = value
             }
             <<< SwitchRow("graphBasal"){ row in
-            row.title = "Graph Basal"
-            row.value = UserDefaultsRepository.graphBasal.value
-        }.onChange { [weak self] row in
-                    guard let value = row.value else { return }
-                    UserDefaultsRepository.graphBasal.value = value
+                row.title = "Graph Basal"
+                row.value = UserDefaultsRepository.graphBasal.value
+            }.onChange { [weak self] row in
+                guard let value = row.value else { return }
+                UserDefaultsRepository.graphBasal.value = value
             }
-            <<< SwitchRow("downloadBolus"){ row in
-                row.title = "Download Bolus"
-                row.value = UserDefaultsRepository.downloadBolus.value
+            <<< SwitchRow("graphBolus"){ row in
+                row.title = "Graph Bolus"
+                row.value = UserDefaultsRepository.graphBolus.value
             }.onChange { [weak self] row in
-                        guard let value = row.value else { return }
-                        UserDefaultsRepository.downloadBolus.value = value
-                }
-           <<< SwitchRow("graphBolus"){ row in
-               row.title = "Graph Bolus"
-               row.value = UserDefaultsRepository.graphBolus.value
-           }.onChange { [weak self] row in
-                       guard let value = row.value else { return }
-                       UserDefaultsRepository.graphBolus.value = value
-               }
-            <<< SwitchRow("downloadCarbs"){ row in
-                row.title = "Download Carbs"
-                row.value = UserDefaultsRepository.downloadCarbs.value
+                guard let value = row.value else { return }
+                UserDefaultsRepository.graphBolus.value = value
+            }
+            <<< SwitchRow("graphCarbs"){ row in
+                row.title = "Graph Carbs"
+                row.value = UserDefaultsRepository.graphCarbs.value
             }.onChange { [weak self] row in
-                        guard let value = row.value else { return }
-                        UserDefaultsRepository.downloadCarbs.value = value
-                }
-              <<< SwitchRow("graphCarbs"){ row in
-                  row.title = "Graph Carbs"
-                  row.value = UserDefaultsRepository.graphCarbs.value
-              }.onChange { [weak self] row in
-                          guard let value = row.value else { return }
-                          UserDefaultsRepository.graphCarbs.value = value
-                  }
-            
-        <<< SwitchRow("downloadPrediction"){ row in
-                 row.title = "Download Prediction"
-                 row.value = UserDefaultsRepository.downloadPrediction.value
-             }.onChange { [weak self] row in
-                         guard let value = row.value else { return }
-                         UserDefaultsRepository.downloadPrediction.value = value
-                 }
-        <<< SwitchRow("graphPrediction"){ row in
-            row.title = "Graph Prediction"
-            row.value = UserDefaultsRepository.graphPrediction.value
-        }.onChange { [weak self] row in
-                    guard let value = row.value else { return }
-                    UserDefaultsRepository.graphPrediction.value = value
+                guard let value = row.value else { return }
+                UserDefaultsRepository.graphCarbs.value = value
+            }
+            <<< SwitchRow("graphOtherTreatments"){ row in
+                row.title = "Graph Other Treatments"
+                row.value = UserDefaultsRepository.graphOtherTreatments.value
+            }.onChange { [weak self] row in
+                guard let value = row.value else { return }
+                UserDefaultsRepository.graphOtherTreatments.value = value
             }
+            
+            
+            
             <<< SwitchRow("debugLog"){ row in
                 row.title = "Show Debug Log"
                 row.value = UserDefaultsRepository.debugLog.value
             }.onChange { [weak self] row in
-                        guard let value = row.value else { return }
-                        UserDefaultsRepository.debugLog.value = value
-                }
-        <<< StepperRow("viewRefreshDelay") { row in
-            row.title = "View Refresh Delay"
-            row.cell.stepper.stepValue = 1
-            row.cell.stepper.minimumValue = 5
-            row.cell.stepper.maximumValue = 30
-            row.value = Double(UserDefaultsRepository.viewRefreshDelay.value)
-            row.displayValueFor = { value in
-                guard let value = value else { return nil }
-                return "\(Int(value))"
-            }
-        }.onChange { [weak self] row in
                 guard let value = row.value else { return }
-                UserDefaultsRepository.viewRefreshDelay.value = Double(value)
-        }
-        +++ ButtonRow() {
-          $0.title = "DONE"
-        }.onCellSelection { (row, arg)  in
-          self.dismiss(animated:true, completion: nil)
-        }
+                UserDefaultsRepository.debugLog.value = value
+            }
+            
+            +++ ButtonRow() {
+                $0.title = "DONE"
+            }.onCellSelection { (row, arg)  in
+                self.dismiss(animated:true, completion: nil)
+            }
     }
 }

LoopFollow/repository/UserDefaults.swift

@@ -73,16 +73,12 @@ class UserDefaultsRepository {
     
     // Debug Settings
         static let downloadTreatments = UserDefaultsValue<Bool>(key: "downloadTreatments", default: true)
-        static let downloadBasal = UserDefaultsValue<Bool>(key: "downloadBasal", default: true)
-        static let downloadBolus = UserDefaultsValue<Bool>(key: "downloadBolus", default: true)
-        static let downloadCarbs = UserDefaultsValue<Bool>(key: "downloadCarbs", default: true)
         static let downloadPrediction = UserDefaultsValue<Bool>(key: "downloadPrediction", default: true)
+        static let graphOtherTreatments = UserDefaultsValue<Bool>(key: "graphOtherTreatments", default: true)
         static let graphBasal = UserDefaultsValue<Bool>(key: "graphBasal", default: true)
         static let graphBolus = UserDefaultsValue<Bool>(key: "graphBolus", default: true)
         static let graphCarbs = UserDefaultsValue<Bool>(key: "graphCarbs", default: true)
-        static let graphPrediction = UserDefaultsValue<Bool>(key: "graphPrediction", default: true)
         static let debugLog = UserDefaultsValue<Bool>(key: "debugLog", default: false)
-        static let viewRefreshDelay = UserDefaultsValue<Double>(key: "viewRefreshDelay", default: 15.0)