From 6b6b521c157dfe03797b1dec64f8a615e73a8dfa Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Thu, 21 Sep 2023 20:46:37 -0600
Subject: - [ios] Add direction arrows to reports. - [ios] Use scales for
 marker sizes and labels. - [ios] Fix builds in Xcode 15.

---
 .../Details/Reports/UnitReportsViewModel.swift     | 49 ++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

(limited to 'iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift')

diff --git a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
index 0132685..3a99f16 100644
--- a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
+++ b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
@@ -19,6 +19,7 @@ import Foundation
 import Combine
 import shared
 
+@MainActor
 class UnitReportsViewModel: ObservableObject {
     @Inject var reportController: ReportController
     @Inject var geofencesController: GeofencesController
@@ -38,25 +39,27 @@ class UnitReportsViewModel: ObservableObject {
     }
     @Published var periodType: ReportDates.PeriodTypes = .today {
         didSet {
-            switch periodType {
-            case .today:
-                reportPeriod = ReportDates.ReportPeriodToday()
-            case .last24:
-                reportPeriod = ReportDates.ReportPeriodLast24()
-            case .yesterday:
-                reportPeriod = ReportDates.ReportPeriodYesterday()
-            case .thisWeek:
-                reportPeriod = ReportDates.ReportPeriodThisWeek()
-            case .last7:
-                reportPeriod = ReportDates.ReportPeriodLast7()
-            case .thisMonth:
-                reportPeriod = ReportDates.ReportPeriodThisMonth()
-            case .last30:
-                reportPeriod = ReportDates.ReportPeriodLast30()
-            case .custom:
-                reportPeriod = ReportDates.ReportPeriodCustom(from: nil, to: nil)
-            default:
-                reportPeriod = ReportDates.ReportPeriodToday()
+            Task { @MainActor in
+                switch periodType {
+                case .today:
+                    reportPeriod = ReportDates.ReportPeriodToday()
+                case .last24:
+                    reportPeriod = ReportDates.ReportPeriodLast24()
+                case .yesterday:
+                    reportPeriod = ReportDates.ReportPeriodYesterday()
+                case .thisWeek:
+                    reportPeriod = ReportDates.ReportPeriodThisWeek()
+                case .last7:
+                    reportPeriod = ReportDates.ReportPeriodLast7()
+                case .thisMonth:
+                    reportPeriod = ReportDates.ReportPeriodThisMonth()
+                case .last30:
+                    reportPeriod = ReportDates.ReportPeriodLast30()
+                case .custom:
+                    reportPeriod = ReportDates.ReportPeriodCustom(from: nil, to: nil)
+                default:
+                    reportPeriod = ReportDates.ReportPeriodToday()
+                }
             }
         }
     }
@@ -136,11 +139,15 @@ class UnitReportsViewModel: ObservableObject {
     }
     
     func setReport (report: ReportController.Report) {
-        self.report = report
+        Task { @MainActor in
+            self.report = report
+        }
     }
     
     private func setGeofences(geofences: [Int: Geofence]) {
-        self.geofences = geofences
+        Task { @MainActor in
+            self.geofences = geofences
+        }
     }
     
     func fetchReport(xlsx: Bool = false) {
-- 
cgit v1.2.3