From 03b3e13a36856777600216ea10baa21466088007 Mon Sep 17 00:00:00 2001 From: Raz Date: Sun, 22 Sep 2024 13:35:36 +0200 Subject: [PATCH] v1.0.12 fix filtering options missing and wording --- PadelClub.xcodeproj/project.pbxproj | 4 ++-- PadelClub/Utils/SourceFileManager.swift | 19 ++--------------- PadelClub/ViewModel/SearchViewModel.swift | 5 +---- .../Agenda/TournamentLookUpView.swift | 2 +- .../Agenda/TournamentSubscriptionView.swift | 9 +++----- .../Shared/SelectablePlayerListView.swift | 21 +++++++++---------- .../Views/Shared/TournamentFilterView.swift | 2 +- 7 files changed, 20 insertions(+), 42 deletions(-) diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index 446a4f8..329d149 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -3155,7 +3155,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.11; + MARKETING_VERSION = 1.0.12; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3198,7 +3198,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.11; + MARKETING_VERSION = 1.0.12; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/PadelClub/Utils/SourceFileManager.swift b/PadelClub/Utils/SourceFileManager.swift index 917c1b4..ac06446 100644 --- a/PadelClub/Utils/SourceFileManager.swift +++ b/PadelClub/Utils/SourceFileManager.swift @@ -227,23 +227,8 @@ class SourceFileManager { } static func getSortOption() -> [SortOption] { - if canFilterByAge() { - return SortOption.allCases - } else { - return [.name, .rank, .tournamentCount, .points] - } - } - - static func canFilterByAge() -> Bool { - let currentMonthData = DataStore.shared.monthData.first(where: { data in - data.monthKey == DataStore.shared.appSettings.lastDataSource - }) - let currentModelVersion = PersistenceController.getModelVersion() - if let currentMonthData, currentMonthData.fileModelIdentifier == currentModelVersion, currentModelVersion != nil { - return true - } - return false - } + return SortOption.allCases + } } enum SourceFile: String, CaseIterable { diff --git a/PadelClub/ViewModel/SearchViewModel.swift b/PadelClub/ViewModel/SearchViewModel.swift index c5e7d87..8d8e9e7 100644 --- a/PadelClub/ViewModel/SearchViewModel.swift +++ b/PadelClub/ViewModel/SearchViewModel.swift @@ -525,10 +525,7 @@ enum DataSet: Int, Identifiable { _tokens = [.rankMoreThan, .rankLessThan, .rankBetween] } - if SourceFileManager.canFilterByAge() { - _tokens.append(.age) - } - + _tokens.append(.age) return _tokens } } diff --git a/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift b/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift index 2f64f44..000ba3f 100644 --- a/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift +++ b/PadelClub/Views/Navigation/Agenda/TournamentLookUpView.swift @@ -267,7 +267,7 @@ struct TournamentLookUpView: View { Text(2.formatted()).tag(2 as Int?) Text(3.formatted()).tag(3 as Int?) } label: { - Text("Durée max (en jours)") + Text("Durée souhaitée (en jours)") } Picker(selection: $appSettings.dayPeriod) { diff --git a/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift b/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift index 7542a43..fcf20e0 100644 --- a/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift +++ b/PadelClub/Views/Navigation/Agenda/TournamentSubscriptionView.swift @@ -204,13 +204,10 @@ struct TournamentSubscriptionView: View { Label("Prévenir votre partenaire", systemImage: "person.2") } - Button("Ajouter à votre agenda") { + Button("Ajouter à votre agenda", systemImage: "calendar") { addEvent() } - ShareLink(item: federalTournament.shareMessage) { - Label("Partager les infos", systemImage: "info") - } Link(destination: URL(string:"https://tenup.fft.fr/tournoi/\(federalTournament.id)")!) { Label("Voir sur Tenup", systemImage: "tennisball") } @@ -295,14 +292,14 @@ struct TournamentSubscriptionView: View { var messageBody: String { let bonjourOuBonsoir = Date().timeOfDay.hello let bonneSoireeOuBonneJournee = Date().timeOfDay.goodbye - let body = [["\(bonjourOuBonsoir),\n\nJe souhaiterais inscrire mon équipe au tournoi : ", build.buildHolderTitle(), "du", federalTournament.computedStartDate, "au", federalTournament.clubLabel() + ".\n"].compacted().joined(separator: " "), teamsString, "\nCordialement,\n", user.fullName() ?? bonneSoireeOuBonneJournee, "----------------------------------\nCe message a été préparé grâce à l'application Padel Club !"].compactMap { $0 }.joined(separator: "\n") + "\n" + let body = [["\(bonjourOuBonsoir),\n\nJe souhaiterais inscrire mon équipe au tournoi : ", build.buildHolderTitle(), "du", federalTournament.computedStartDate, "au", federalTournament.clubLabel() + ".\n"].compacted().joined(separator: " "), teamsString, "\nCordialement,\n", user.fullName() ?? bonneSoireeOuBonneJournee, "----------------------------------\nCe message a été préparé grâce à l'application Padel Club !\n\(URLs.appStore.rawValue)"].compactMap { $0 }.joined(separator: "\n") + "\n" return body } var messageBodyShort: String { let bonjourOuBonsoir = Date().timeOfDay.hello let bonneSoireeOuBonneJournee = Date().timeOfDay.goodbye - let body = [["\(bonjourOuBonsoir),\n\nJe souhaiterais inscrire mon équipe au tournoi : ", build.buildHolderTitle(), "du", federalTournament.computedStartDate, "au", federalTournament.clubLabel() + ".\n"].compacted().joined(separator: " "), teamsString, "\nCordialement,\n", user.fullName() ?? bonneSoireeOuBonneJournee].compactMap { $0 }.joined(separator: "\n") + "\n" + let body = [["\(bonjourOuBonsoir),\n\nJe souhaiterais inscrire mon équipe au tournoi : ", build.buildHolderTitle(), "du", federalTournament.computedStartDate, "au", federalTournament.clubLabel() + ".\n"].compacted().joined(separator: " "), teamsString, "\nCordialement,\n", user.fullName() ?? bonneSoireeOuBonneJournee, "----------------------------------\nCe message a été préparé grâce à l'application Padel Club !\n\(URLs.appStore.rawValue)"].compactMap { $0 }.joined(separator: "\n") + "\n" return body } diff --git a/PadelClub/Views/Shared/SelectablePlayerListView.swift b/PadelClub/Views/Shared/SelectablePlayerListView.swift index 7ba50a3..8ecd8cc 100644 --- a/PadelClub/Views/Shared/SelectablePlayerListView.swift +++ b/PadelClub/Views/Shared/SelectablePlayerListView.swift @@ -91,21 +91,20 @@ struct SelectablePlayerListView: View { } Divider() - if SourceFileManager.canFilterByAge() { - Section { - Picker(selection: $searchViewModel.selectedAgeCategory) { - ForEach(FederalTournamentAge.allCases) { ageCategory in - Text(ageCategory.localizedLabel(.title)).tag(ageCategory) - } - } label: { - Text("Catégorie d'âge") + Section { + Picker(selection: $searchViewModel.selectedAgeCategory) { + ForEach(FederalTournamentAge.allCases) { ageCategory in + Text(ageCategory.localizedLabel(.title)).tag(ageCategory) } - - } header: { + } label: { Text("Catégorie d'âge") } - Divider() + + } header: { + Text("Catégorie d'âge") } + Divider() + Section { Toggle(isOn: .init(get: { return searchViewModel.hideAssimilation == false diff --git a/PadelClub/Views/Shared/TournamentFilterView.swift b/PadelClub/Views/Shared/TournamentFilterView.swift index 9d0a2c3..8e84a0b 100644 --- a/PadelClub/Views/Shared/TournamentFilterView.swift +++ b/PadelClub/Views/Shared/TournamentFilterView.swift @@ -36,7 +36,7 @@ struct TournamentFilterView: View { Text(2.formatted()).tag(2 as Int?) Text(3.formatted()).tag(3 as Int?) } label: { - Text("Durée max (en jours)") + Text("Durée souhaitée (en jours)") } Picker(selection: $federalDataViewModel.dayPeriod) {