Code cleanup

LoopFollow.xcodeproj/project.pbxproj

@@ -120,11 +120,9 @@
 		FC7CE584248ABE37001F83B8 /* Oringz.caf in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE515248ABE37001F83B8 /* Oringz.caf */; };
 		FC7CE585248ABE37001F83B8 /* Siri_Glucose_Dropping_Fast.caf in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE516248ABE37001F83B8 /* Siri_Glucose_Dropping_Fast.caf */; };
 		FC7CE586248ABE37001F83B8 /* Martian_Gun.caf in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE517248ABE37001F83B8 /* Martian_Gun.caf */; };
-		FC7CE588248ABE5A001F83B8 /* Alarms.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE587248ABE5A001F83B8 /* Alarms.swift */; };
 		FC7CE58A248ABEA3001F83B8 /* AlarmSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */; };
 		FC7CE58D248ABEF2001F83B8 /* alarm.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE58B248ABEF1001F83B8 /* alarm.mp3 */; };
 		FC7CE58E248ABEF2001F83B8 /* alarm-notification.m4a in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE58C248ABEF1001F83B8 /* alarm-notification.m4a */; };
-		FC7CE598248B0AF2001F83B8 /* AlarmEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE597248B0AF2001F83B8 /* AlarmEditing.swift */; };
 		FC7CE59C248D33A9001F83B8 /* dragbar.png in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE59B248D33A9001F83B8 /* dragbar.png */; };
 		FC7CE59F248D8D23001F83B8 /* SnoozeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE59E248D8D23001F83B8 /* SnoozeViewController.swift */; };
 		FC9788182485969B00A7906C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC9788172485969B00A7906C /* AppDelegate.swift */; };
@@ -145,7 +143,6 @@
 		FCC6886B24898FD800A0279D /* ObservationToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886A24898FD800A0279D /* ObservationToken.swift */; };
 		FCC6886D2489909D00A0279D /* AnyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886C2489909D00A0279D /* AnyConvertible.swift */; };
 		FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886E2489A53800A0279D /* AppConstants.swift */; };
-		FCC68874248A75D000A0279D /* NightScout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC68873248A75D000A0279D /* NightScout.swift */; };
 		FCFEEC9E2486E68E00402A7F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCFEEC9D2486E68E00402A7F /* WebKit.framework */; };
 		FCFEECA02488157B00402A7F /* Chart.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCFEEC9F2488157B00402A7F /* Chart.swift */; };
 		FCFEECA2248857A600402A7F /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCFEECA1248857A600402A7F /* SettingsViewController.swift */; };
@@ -266,11 +263,9 @@
 		FC7CE515248ABE37001F83B8 /* Oringz.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Oringz.caf; sourceTree = "<group>"; };
 		FC7CE516248ABE37001F83B8 /* Siri_Glucose_Dropping_Fast.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Siri_Glucose_Dropping_Fast.caf; sourceTree = "<group>"; };
 		FC7CE517248ABE37001F83B8 /* Martian_Gun.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Martian_Gun.caf; sourceTree = "<group>"; };
-		FC7CE587248ABE5A001F83B8 /* Alarms.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alarms.swift; sourceTree = "<group>"; };
 		FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlarmSound.swift; sourceTree = "<group>"; };
 		FC7CE58B248ABEF1001F83B8 /* alarm.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = alarm.mp3; sourceTree = "<group>"; };
 		FC7CE58C248ABEF1001F83B8 /* alarm-notification.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = "alarm-notification.m4a"; sourceTree = "<group>"; };
-		FC7CE597248B0AF2001F83B8 /* AlarmEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmEditing.swift; sourceTree = "<group>"; };
 		FC7CE59B248D33A9001F83B8 /* dragbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dragbar.png; sourceTree = "<group>"; };
 		FC7CE59E248D8D23001F83B8 /* SnoozeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnoozeViewController.swift; sourceTree = "<group>"; };
 		FC8DEEE62485D1ED0075863F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -295,7 +290,6 @@
 		FCC6886C2489909D00A0279D /* AnyConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyConvertible.swift; sourceTree = "<group>"; };
 		FCC6886E2489A53800A0279D /* AppConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppConstants.swift; sourceTree = "<group>"; };
 		FCC688702489A57C00A0279D /* Loop Follow.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Loop Follow.entitlements"; sourceTree = "<group>"; };
-		FCC68873248A75D000A0279D /* NightScout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightScout.swift; sourceTree = "<group>"; };
 		FCFEEC9D2486E68E00402A7F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		FCFEEC9F2488157B00402A7F /* Chart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Chart.swift; sourceTree = "<group>"; };
 		FCFEECA1248857A600402A7F /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
@@ -531,7 +525,6 @@
 				FC97881D2485969B00A7906C /* NightScoutViewController.swift */,
 				FCFEECA1248857A600402A7F /* SettingsViewController.swift */,
 				FCC6884F248935D800A0279D /* AlarmViewController.swift */,
-				FC7CE597248B0AF2001F83B8 /* AlarmEditing.swift */,
 				FC7CE59E248D8D23001F83B8 /* SnoozeViewController.swift */,
 			);
 			path = Controllers;
@@ -541,8 +534,6 @@
 			isa = PBXGroup;
 			children = (
 				FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */,
-				FCC68873248A75D000A0279D /* NightScout.swift */,
-				FC7CE587248ABE5A001F83B8 /* Alarms.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -781,7 +772,6 @@
 				FCC68850248935D800A0279D /* AlarmViewController.swift in Sources */,
 				FC7CE59F248D8D23001F83B8 /* SnoozeViewController.swift in Sources */,
 				FCC6886724898F8000A0279D /* UserDefaultsValue.swift in Sources */,
-				FCC68874248A75D000A0279D /* NightScout.swift in Sources */,
 				FC97881E2485969B00A7906C /* NightScoutViewController.swift in Sources */,
 				FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */,
 				FCC6886924898FB100A0279D /* UserDefaultsValueGroups.swift in Sources */,
@@ -789,14 +779,12 @@
 				FC9788242485969B00A7906C /* LoopFollow.xcdatamodeld in Sources */,
 				FCFEECA2248857A600402A7F /* SettingsViewController.swift in Sources */,
 				FCFEECA02488157B00402A7F /* Chart.swift in Sources */,
-				FC7CE598248B0AF2001F83B8 /* AlarmEditing.swift in Sources */,
 				FCC6886524898EEE00A0279D /* UserDefaults.swift in Sources */,
 				FC97881C2485969B00A7906C /* MainViewController.swift in Sources */,
 				FCC0FAC224922A22003E610E /* DictionaryKeyPath.swift in Sources */,
 				FC9788182485969B00A7906C /* AppDelegate.swift in Sources */,
 				FCC6886B24898FD800A0279D /* ObservationToken.swift in Sources */,
 				FCC6886D2489909D00A0279D /* AnyConvertible.swift in Sources */,
-				FC7CE588248ABE5A001F83B8 /* Alarms.swift in Sources */,
 				FC97881A2485969B00A7906C /* SceneDelegate.swift in Sources */,
 				FC3CAB022493B6220068A152 /* BackgroundTaskAudio.swift in Sources */,
 			);

LoopFollow/Base.lproj/Main.storyboard

@@ -286,38 +286,11 @@
                     </view>
                     <tabBarItem key="tabBarItem" title="Alarms" image="alarm" catalog="system" id="c7L-5b-Di9"/>
                     <navigationItem key="navigationItem" id="Lph-Pi-ZZL"/>
-                    <connections>
-                        <segue destination="fP3-PV-hMS" kind="show" identifier="AlarmEditingViewControllerSegue" id="K2h-Yr-q5I"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Rld-0Y-q4t" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="130" y="700"/>
         </scene>
-        <!--Add Alarm-->
-        <scene sceneID="oTz-PX-3Us">
-            <objects>
-                <viewController storyboardIdentifier="AlarmEditingViewController" id="BD0-Og-FEt" customClass="AlarmEditingViewController" customModule="Loop_Follow" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Exs-PI-PhV">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="786"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <viewLayoutGuide key="safeArea" id="W7O-P3-NQ9"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Add Alarm" id="hL7-sl-fwI">
-                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="Mnx-mb-4oC">
-                            <connections>
-                                <segue destination="7Mg-Xe-OYb" kind="unwind" unwindAction="unwindToAlarmsWithSender:" id="11i-mE-mpx"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="TfG-GM-c1R" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-                <exit id="7Mg-Xe-OYb" userLabel="Exit" sceneMemberID="exit"/>
-            </objects>
-            <point key="canvasLocation" x="1063.768115942029" y="1398.8839285714284"/>
-        </scene>
         <!--Settings-->
         <scene sceneID="ORV-wr-Fd3">
             <objects>
@@ -363,25 +336,6 @@
             </objects>
             <point key="canvasLocation" x="0.0" y="0.0"/>
         </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="VqK-Co-iIw">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="fP3-PV-hMS" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <navigationItem key="navigationItem" id="OF1-xU-Dt2"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="hR1-dQ-P89">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="BD0-Og-FEt" kind="relationship" relationship="rootViewController" id="asA-z5-dbm"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Bn9-hx-b59" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="153.62318840579712" y="1398.8839285714284"/>
-        </scene>
     </scenes>
     <resources>
         <image name="alarm" catalog="system" width="124" height="128"/>

LoopFollow/Controllers/AlarmEditing.swift

@@ -1,67 +0,0 @@
-//
-//  AlarmViewController.swift
-//  LoopFollow
-//
-//  Created by Jon Fawcett on 6/3/20.
-//  Copyright © 2020 Jon Fawcett. All rights reserved.
-//
-
-import UIKit
-import Eureka
-
-
-/*
- 
- 
- Temporary code...keep here for long-term to create completely customized alarms.
- 
- */
-
-class AlarmEditingViewController: FormViewController {
-
-
- 
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-
-        form
-            +++ Section("Alert Settings")
-            <<< PickerInputRow<String>("Alert Type"){
-                $0.title = "Options"
-                $0.options = ["Over BG", "Under BG", "Delta Change", "Missed Reading", "Loop Status", "SAGE", "CAGE", "Missed Bolus", "App Inactive"]
-                $0.value = $0.options.first
-            }
-            <<< StepperRow() { row in
-                row.title = "BG"
-                row.tag = "bg"
-                row.cell.stepper.stepValue = 1
-                row.cell.stepper.minimumValue = 40
-                row.cell.stepper.maximumValue = 400
-                row.value = 100
-                row.displayValueFor = { value in
-                    guard let value = value else { return nil }
-                    return "\(Int(value))"
-                }
-            }
-            <<< StepperRow() { row in
-                row.title = "Persistent (Minutes)"
-                row.tag = "time"
-                row.cell.stepper.stepValue = 5
-                row.cell.stepper.minimumValue = 5
-                row.cell.stepper.maximumValue = 120
-                row.value = 60
-                row.displayValueFor = { value in
-                    guard let value = value else { return nil }
-                    return "\(Int(value))"
-                }
-            }
-            
-        
-    }
-
-
-}
-
-

LoopFollow/Controllers/MainViewController.swift

@@ -113,7 +113,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         }
         // Disable the snoozer tab unless an alarm is active
         let tabBarControllerItems = self.tabBarController?.tabBar.items
-        if let arrayOfTabBarItems = tabBarControllerItems as! AnyObject as? NSArray{
+        if let arrayOfTabBarItems = tabBarControllerItems as AnyObject as? NSArray{
             snoozeTabItem = arrayOfTabBarItems[2] as! UITabBarItem
         }
         snoozeTabItem.isEnabled = false;
@@ -372,7 +372,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             return
         }
             
-        let json = try? JSONSerialization.jsonObject(with: data) as! [[String:AnyObject]]
+            let json = try? (JSONSerialization.jsonObject(with: data) as! [[String:AnyObject]])
         if let json = json {
             DispatchQueue.main.async {
                 self.updateDeviceStatusDisplay(jsonDeviceStatus: json)
@@ -1191,10 +1191,10 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         
         // Check Sage
         if UserDefaultsRepository.alertSAGEActive.value {
-            var insertTime = Double(UserDefaultsRepository.alertSageInsertTime.value)
-            var alertDistance = Double(UserDefaultsRepository.alertSAGE.value * 60 * 60)
-            var delta = now - insertTime
-            var tenDays = 10 * 24 * 60 * 60
+            let insertTime = Double(UserDefaultsRepository.alertSageInsertTime.value)
+            let alertDistance = Double(UserDefaultsRepository.alertSAGE.value * 60 * 60)
+            let delta = now - insertTime
+            let tenDays = 10 * 24 * 60 * 60
             if Double(tenDays) - Double(delta) <= alertDistance {
                 AlarmSound.whichAlarm = "Sensor Change Alert"
                 triggerAlarm(sound: UserDefaultsRepository.alertSAGESound.value, snooozedBGReadingTime: nil)
@@ -1204,10 +1204,10 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         
         // Check Cage
         if UserDefaultsRepository.alertCAGEActive.value {
-            var insertTime = Double(UserDefaultsRepository.alertCageInsertTime.value)
-            var alertDistance = Double(UserDefaultsRepository.alertCAGE.value * 60 * 60)
-            var delta = now - insertTime
-            var tenDays = 3 * 24 * 60 * 60
+            let insertTime = Double(UserDefaultsRepository.alertCageInsertTime.value)
+            let alertDistance = Double(UserDefaultsRepository.alertCAGE.value * 60 * 60)
+            let delta = now - insertTime
+            let tenDays = 3 * 24 * 60 * 60
             if Double(tenDays) - Double(delta) <= alertDistance {
                 AlarmSound.whichAlarm = "Pump Change Alert"
                 triggerAlarm(sound: UserDefaultsRepository.alertCAGESound.value, snooozedBGReadingTime: nil)

LoopFollow/Models/Alarms.swift

@@ -1,16 +0,0 @@
-//
-//  Alarms.swift
-//  LoopFollow
-//
-//  Created by Jon Fawcett on 6/5/20.
-//  Copyright © 2020 Jon Fawcett. All rights reserved.
-//
-
-import Foundation
-
-
-class Alarms {
-    
-    
-    
-}

LoopFollow/Models/NightScout.swift

@@ -1,73 +0,0 @@
-//
-//  NightScout.swift
-//  LoopFollow
-//
-//  Created by Jon Fawcett on 6/5/20.
-//  Copyright © 2020 Jon Fawcett. All rights reserved.
-//
-
-import Foundation
-import UIKit
-
-class NightscoutService {
-    
-    static let singleton = NightscoutService()
-    
-    //NS BG Struct
-    struct bgData: Codable {
-        var sgv: Int
-        var date: TimeInterval
-        var direction: String?
-        var hoursMinutes: String?
-    }
-    
-    let DIRECTIONS = ["-", "↑↑", "↑", "↗", "→", "↘︎", "↓", "↓↓", "-", "-"]
-    var url: String
-    
-    init(){
-        url = UserDefaultsRepository.url.value
-    }
-    
-
-    // Main NS Data Pull
-    func loadBGData(hours: Int = UserDefaultsRepository.hoursToLoad.value) {
-        let count = String(hours * 60/5)
-        let token = UserDefaultsRepository.token.value
-        var urlBGDataPath: String = url + "/api/v1/entries/sgv.json?"
-        if token == "" {
-            urlBGDataPath = urlBGDataPath + "count=" + String(count)
-        }
-        else
-        {
-            urlBGDataPath = urlBGDataPath + "token=" + token + "&count=" + String(count)
-        }
-        guard let urlBGData = URL(string: urlBGDataPath) else {
-            return
-        }
-        var request = URLRequest(url: urlBGData)
-        request.cachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
-        
-        let getBGTask = URLSession.shared.dataTask(with: request) { data, response, error in
-            guard error == nil else {
-                return
-            }
-            guard let data = data else {
-                return
-            }
-            
-            let decoder = JSONDecoder()
-            let entriesResponse = try? decoder.decode([bgData].self, from: data)
-            if let entriesResponse = entriesResponse {
-                for i in 0..<entriesResponse.count {
-                    
-                }
-
-            }
-            
-        }
-        getBGTask.resume()
-    }
-    
-
-    
-}