Tasks 300 - 303

Cozie Watch App/ContentView.swift

@@ -8,6 +8,14 @@
 import SwiftUI
 import WatchConnectivity
 
+struct UICommon {
+    static let buttonHeight: CGFloat = 45
+    static let cornerRadius: CGFloat = 8
+
+    static let buttonColor = Color(.displayP3, red: 1.0, green: 1.0, blue: 1.0, opacity: 0.20)
+    static let selectedButtonColor = Color(.displayP3, red: 1.0, green: 1.0, blue: 1.0, opacity: 0.12)
+}
+
 struct ContentView: View {
     @StateObject var viewModel = WatchSurveyViewModel()
     var body: some View {
@@ -18,7 +26,7 @@ struct ContentView: View {
                     .multilineTextAlignment(.center)
                     .padding([.leading, .trailing], 8)
                     .onAppear {
-                        viewModel.prepare()
+                        viewModel.prepareLocationAndConnectivityManager()
                     }
                 Image(systemName: "arrow.triangle.2.circlepath")
                     .font(.system(size: 35))

Cozie Watch App/Interactors/WatchSurveyInteractor.swift

@@ -25,21 +25,28 @@ class SurveyHistory: Codable {
     }
 }
 
-class WatchSurveyInteractor {
+final class WatchSurveyInteractor {
     let healthInteractor: HealthKitInteractor = HealthKitInteractor(storage: StorageManager.shared, userData: StorageManager.shared, backendData: StorageManager.shared, loger: StorageManager.shared, dataPrefix: "ws")
     let offlineMode = OfflineModeManager()
 
-    func sendSurveyData(watchSurvey: WatchSurvey?,
+    func healthDataPreload(trigger: String = CommunicationKeys.syncBackgroundTaskTrigger.rawValue, completion:((_ models: [HealthModel]?)->())?) {
+        healthInteractor.requestHealthData(trigger: trigger, completion: completion)
+    }
+
+    func sendSurveyData(watchSurvey: WatchSurveyModelController?,
                         selectedOptions:[SelectedSurveyInfo],
                         location: CLLocation?,
                         time: SelectedSurveyTime,
                         storage: StorageManager = StorageManager.shared,
+                        healthCache: [HealthModel]? = nil,
                         logsComplition:(()->())? = nil, completion:((_ success: Bool, _ error: Error?)->())?) {
         let date = Date()
         let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        dateFormatter.dateFormat = DateFormat.defaultFormat
+        // dateFormatter.locale = Locale(identifier: "en_US_POSIX")
         let dateString = dateFormatter.string(from: date)
 
+
         let tags = [WatchSurveyKeys.idOnesignal.rawValue: storage.userOneSignalID(),
                     WatchSurveyKeys.idParticipant.rawValue: storage.userID(),
                     WatchSurveyKeys.idPassword.rawValue: storage.paswordID()]
@@ -80,8 +87,8 @@ class WatchSurveyInteractor {
             storage.seveLogs(logs: String(data: jsonToLog, encoding: .utf8) ?? "")
             logsComplition?()
 
-            if  offlineMode.isEnabled {
-                healthInteractor.sendData(trigger: CommunicationKeys.syncWatchSurveyTrigger.rawValue, timeout: 0) { succces in
+            if offlineMode.isEnabled {
+                healthInteractor.sendData(trigger: CommunicationKeys.syncWatchSurveyTrigger.rawValue, timeout: 0, healthCache: healthCache) { succces in
                     completion?(true, nil)
                 }
             } else {
@@ -90,7 +97,7 @@ class WatchSurveyInteractor {
                     case .success(let data):
                         debugPrint(String(data: data, encoding: .utf8) ?? "somthing whent wrong!!!")
                         //completion?(true, nil)
-                        self?.healthInteractor.sendData(trigger: CommunicationKeys.syncWatchSurveyTrigger.rawValue, timeout: 0) { succces in
+                        self?.healthInteractor.sendData(trigger: CommunicationKeys.syncWatchSurveyTrigger.rawValue, timeout: 0, healthCache: healthCache) { succces in
                             completion?(true, nil)
                         }
                     case .failure(let error):
@@ -156,13 +163,13 @@ class WatchSurveyInteractor {
                     WatchSurveyKeys.idParticipant.rawValue: storage.userID(),
                     WatchSurveyKeys.idPassword.rawValue: storage.paswordID()]
 
-        let filds = [WatchSurveyKeys.actionButtonKey.rawValue: action,
+        let fields = [WatchSurveyKeys.actionButtonKey.rawValue: action,
                      WatchSurveyKeys.transmitTrigger.rawValue: WatchSurveyKeys.transmitTriggerPushValue.rawValue]
 
         let response: [String : Any] = [WatchSurveyKeys.postTime.rawValue: formattedDate(),
                                         WatchSurveyKeys.measurement.rawValue: storage.expirimentID(),
                                         WatchSurveyKeys.tags.rawValue: tags,
-                                        WatchSurveyKeys.fields.rawValue: filds]
+                                        WatchSurveyKeys.fields.rawValue: fields]
 
         let api = storage.watchSurveyAPI()
         offlineMode.updateWith(apiInfo: (wUrl: api.url, wKey: api.key))
@@ -206,7 +213,7 @@ class WatchSurveyInteractor {
     private func formattedDate() -> String {
         let date = Date()
         let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        dateFormatter.dateFormat = DateFormat.defaultFormat
         return dateFormatter.string(from: date)
     }
 

Cozie Watch App/Managers/LocationManager.swift

@@ -8,7 +8,12 @@
 import Foundation
 import CoreLocation
 
-class LocationManager: NSObject {
+protocol UpdateLocationProtocol {
+    func updateLocation(completion: (()->())?)
+    var currentLocation: CLLocation? { get }
+}
+
+final class LocationManager: NSObject {
     var locationManager: CLLocationManager? = nil
     var currentLocation: CLLocation? = nil
     var lastUpdateDate: Date?
@@ -22,6 +27,20 @@ class LocationManager: NSObject {
     }
 }
 
+extension LocationManager: UpdateLocationProtocol {
+    func updateLocation(completion: (()->())?) {
+        self.completion = completion
+
+        if locationManager == nil {
+            self.requestAuth()
+        } else {
+            if locationManager!.authorizationStatus == .authorizedWhenInUse || locationManager!.authorizationStatus == .authorizedAlways {
+                locationManager?.requestLocation()
+            }
+        }
+    }
+}
+
 extension LocationManager: CLLocationManagerDelegate {
     func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
         switch status {

Cozie Watch App/Managers/StorageManager.swift

@@ -23,6 +23,7 @@ class StorageManager: CozieStorageProtocol {
         case lastSurveyTimeInterval = "CozieLastSurveyTimeIntervalKey"
         case sevedSurveyCount = "CozieSevedSurveyCount"
         case notSyncedSurvey = "CozieNotSyncedSurvey"
+        case healthMaxCutoffTimeintervalKey = "CozieHealthMaxCutoffTimeintervalKey"
 
         // Storage postfix
         case storagePostfixTime = "_wstorage_time"
@@ -118,6 +119,15 @@ class StorageManager: CozieStorageProtocol {
         return (UserDefaults.standard.value(forKey: Keys.lastSurveyTimeInterval.rawValue) as? Int) ?? 0
     }
 
+    // MARK: Last survey send
+    func saveHealthMaxCutoffTimeinterval(_ interval: Double) {
+        UserDefaults.standard.set(interval, forKey: Keys.healthMaxCutoffTimeintervalKey.rawValue)
+    }
+
+    func healthMaxCutoffTimeinterval() -> Double {
+        return (UserDefaults.standard.value(forKey: Keys.healthMaxCutoffTimeintervalKey.rawValue) as? Double) ?? 0
+    }
+
     // MARK: Save survey logs
 
     private func getDocumentsDirectory() -> URL {
@@ -242,6 +252,10 @@ class StorageManager: CozieStorageProtocol {
 
     // MARK: HealthKit data storage
 
+    func maxHealthCutoffInteval() -> Double {
+        return healthMaxCutoffTimeinterval()
+    }
+
     func healthLastSyncedTimeInterval(offline: Bool) -> Double {
         return UserDefaults.standard.value(forKey: offline ? Keys.healthLastSyncOfflineKey.rawValue : Keys.healthLastSyncKey.rawValue) as? Double ?? 0.0
     }