Jonas Björkert пре 1 година
родитељ
комит
236c153c2f

+ 1 - 29
LoopFollow/Controllers/AppStateController.swift

@@ -10,37 +10,9 @@ import Foundation
 
 // Setup App States to comminicate between views
 
-// Graph Setup Flags
-enum ChartSettingsChangeEnum: Int {
-    case chartScaleXChanged = 1
-    case showDotsChanged = 2
-    case showLinesChanged = 4
-    case offsetCarbsBolusChanged = 8
-    case hoursToLoadChanged = 16
-    case predictionToLoadChanged = 32
-    case minBasalScaleChanged = 64
-    case minBGScaleChanged = 128
-    case overrideDisplayLocationChanged = 256
-    case lowLineChanged = 512
-    case highLineChanged = 1024
-    case smallGraphHeight = 2048
-    case showDIALinesChanged = 4096
-    case showMidnightLinesChanged = 8192
-    case show30MinLineChanged = 16384
-    case show90MinLineChanged = 32768
-}
-
 class AppStateController {
     // add app states & methods here
 
-    // General Settings States
-    var generalSettingsChanged: Bool = false
-    var generalSettingsChanges: Int = 0
-
     // Chart Settings State
-    var chartSettingsChanged: Bool = false // settings change has ocurred
-    var chartSettingsChanges: Int = 0 // what settings have changed
-
-    // Info Data Settings State; no need for flags
-    var infoDataSettingsChanged: Bool = false
+    var chartSettingsChanged: Bool = false
 }

+ 0 - 9
LoopFollow/ViewControllers/GraphSettingsViewController.swift

@@ -79,7 +79,6 @@ class GraphSettingsViewController: FormViewController {
                 // tell main screen that grap needs updating
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.showDotsChanged.rawValue
                 }
             }
             <<< SwitchRow("switchRowLines") { row in
@@ -94,7 +93,6 @@ class GraphSettingsViewController: FormViewController {
 
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.showLinesChanged.rawValue
                 }
             }
             <<< SwitchRow("showValues") { row in
@@ -121,7 +119,6 @@ class GraphSettingsViewController: FormViewController {
                 // tell main screen that graph needs updating
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.showDIALinesChanged.rawValue
                 }
             }
             <<< SwitchRow("show30MinLine") { row in
@@ -134,7 +131,6 @@ class GraphSettingsViewController: FormViewController {
                 // Tell the main screen that graph needs updating
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.show30MinLineChanged.rawValue
                 }
             }
             <<< SwitchRow("show90MinLine") { row in
@@ -147,7 +143,6 @@ class GraphSettingsViewController: FormViewController {
                 // Tell the main screen that graph needs updating
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.show90MinLineChanged.rawValue
                 }
             }
             <<< SwitchRow("smallGraphTreatments") { row in
@@ -173,7 +168,6 @@ class GraphSettingsViewController: FormViewController {
 
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.smallGraphHeight.rawValue
                 }
             }
             <<< StepperRow("predictionToLoad") { row in
@@ -231,7 +225,6 @@ class GraphSettingsViewController: FormViewController {
                 // tell main screen to update
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.lowLineChanged.rawValue
                 }
             }
             <<< StepperRow("highLine") { row in
@@ -254,7 +247,6 @@ class GraphSettingsViewController: FormViewController {
                 // let app state know of the change
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.highLineChanged.rawValue
                 }
             }
             <<< StepperRow("downloadDays") { row in
@@ -282,7 +274,6 @@ class GraphSettingsViewController: FormViewController {
                 // tell main screen that graph needs updating
                 if let appState = self!.appStateController {
                     appState.chartSettingsChanged = true
-                    appState.chartSettingsChanges |= ChartSettingsChangeEnum.showMidnightLinesChanged.rawValue
                 }
             }
 

+ 2 - 19
LoopFollow/ViewControllers/MainViewController.swift

@@ -467,31 +467,14 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         // check the app state
         if let appState = appStateController {
             if appState.chartSettingsChanged {
-                // can look at settings flags to be more fine tuned
                 updateBGGraphSettings()
 
-                if ChartSettingsChangeEnum.smallGraphHeight.rawValue != 0 {
-                    smallGraphHeightConstraint.constant = CGFloat(UserDefaultsRepository.smallGraphHeight.value)
-                    view.layoutIfNeeded()
-                }
+                smallGraphHeightConstraint.constant = CGFloat(UserDefaultsRepository.smallGraphHeight.value)
+                view.layoutIfNeeded()
 
                 // reset the app state
                 appState.chartSettingsChanged = false
-                appState.chartSettingsChanges = 0
-            }
-            if appState.generalSettingsChanged {
-                // reset the app state
-                appState.generalSettingsChanged = false
-                appState.generalSettingsChanges = 0
             }
-            if appState.infoDataSettingsChanged {
-                infoTable.reloadData()
-
-                // reset
-                appState.infoDataSettingsChanged = false
-            }
-
-            // add more processing of the app state
         }
     }