From 1eab4c44b736fe80e5e593cb6e0d009940a9afdb Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 12 Jun 2024 23:00:32 +0200
Subject: [PATCH] compilation improvements

---
 PadelClub/Data/TeamScore.swift                             | 2 +-
 PadelClub/Views/Navigation/Agenda/ActivityView.swift       | 2 +-
 PadelClub/Views/Navigation/MainView.swift                  | 3 ++-
 PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift | 6 +++++-
 PadelClub/Views/Tournament/TournamentView.swift            | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/PadelClub/Data/TeamScore.swift b/PadelClub/Data/TeamScore.swift
index eff6ec4..8d4a33c 100644
--- a/PadelClub/Data/TeamScore.swift
+++ b/PadelClub/Data/TeamScore.swift
@@ -45,7 +45,7 @@ class TeamScore: ModelObject, Storable {
     // MARK: - Computed dependencies
     
     func matchObject() -> Match? {
-        return Store.main.findById(self.match)
+        return DataStore.shared.matches.findById(self.match)
     }
     
     var team: TeamRegistration? {
diff --git a/PadelClub/Views/Navigation/Agenda/ActivityView.swift b/PadelClub/Views/Navigation/Agenda/ActivityView.swift
index 50cc571..050bd91 100644
--- a/PadelClub/Views/Navigation/Agenda/ActivityView.swift
+++ b/PadelClub/Views/Navigation/Agenda/ActivityView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 struct ActivityView: View {
     @EnvironmentObject var dataStore: DataStore
     @Environment(NavigationViewModel.self) private var navigation
-    @State private var federalDataViewModel: FederalDataViewModel = .shared
+    @State private var federalDataViewModel: FederalDataViewModel = FederalDataViewModel.shared
     @State private var searchText: String = ""
     
     @State private var presentFilterView: Bool = false
diff --git a/PadelClub/Views/Navigation/MainView.swift b/PadelClub/Views/Navigation/MainView.swift
index 39fb49d..4976bcc 100644
--- a/PadelClub/Views/Navigation/MainView.swift
+++ b/PadelClub/Views/Navigation/MainView.swift
@@ -45,7 +45,8 @@ struct MainView: View {
     )}
 
     var matches: [Match] {
-        return dataStore.matches.filter { $0.confirmed && $0.startDate != nil && $0.endDate == nil && $0.courtIndex != nil }
+        return dataStore.matches.filter { match in
+            match.confirmed && match.startDate != nil && match.endDate == nil && match.courtIndex != nil }
     }
     
     private func _isConnected() -> Bool {
diff --git a/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift b/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift
index 1cb74a8..f979e73 100644
--- a/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift
+++ b/PadelClub/Views/Navigation/Toolbox/DebugSettingsView.swift
@@ -37,7 +37,11 @@ struct DebugSettingsView: View {
     }
     
     fileprivate var _synchronized: String {
-        return "\(PListReader.readBool(plist: "local", key: "synchronized"))"
+        if let synchronized = PListReader.readBool(plist: "local", key: "synchronized") {
+            return "\(synchronized)"
+        } else {
+            return "not specified"
+        }
     }
     
     fileprivate var _canSynchronize: String {
diff --git a/PadelClub/Views/Tournament/TournamentView.swift b/PadelClub/Views/Tournament/TournamentView.swift
index c9806da..0049fb2 100644
--- a/PadelClub/Views/Tournament/TournamentView.swift
+++ b/PadelClub/Views/Tournament/TournamentView.swift
@@ -15,8 +15,8 @@ struct TournamentView: View {
     @State var tournament: Tournament
     var presentationContext: PresentationContext = .agenda
     
-    let tournamentSelectionTip = TournamentSelectionTip()
-    let tournamentRunningTip = TournamentRunningTip()
+    let tournamentSelectionTip: TournamentSelectionTip = TournamentSelectionTip()
+    let tournamentRunningTip: TournamentRunningTip = TournamentRunningTip()
     
     var selectedTournamentId: Binding<String> { Binding(
         get: { tournament.id },