From f64a600f16610a03534774125ff110f70cbecb2c Mon Sep 17 00:00:00 2001 From: Raz Date: Thu, 29 Aug 2024 15:41:01 +0200 Subject: [PATCH] fix links --- .../xcshareddata/xcschemes/PadelClub.xcscheme | 2 +- PadelClub/Utils/URLs.swift | 9 +++------ .../Views/Navigation/Toolbox/ToolboxView.swift | 8 ++++++++ .../Tournament/Subscription/SubscriptionView.swift | 13 ++++--------- PadelClub/Views/User/UserCreationView.swift | 9 +++++---- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme index b4b5279..56f7786 100644 --- a/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme +++ b/PadelClub.xcodeproj/xcshareddata/xcschemes/PadelClub.xcscheme @@ -54,7 +54,7 @@ String { - return "\(URLs.main.rawValue)\(component)" - } - + } } enum PageLink: String, Identifiable, CaseIterable { diff --git a/PadelClub/Views/Navigation/Toolbox/ToolboxView.swift b/PadelClub/Views/Navigation/Toolbox/ToolboxView.swift index 9677449..f0d9198 100644 --- a/PadelClub/Views/Navigation/Toolbox/ToolboxView.swift +++ b/PadelClub/Views/Navigation/Toolbox/ToolboxView.swift @@ -187,6 +187,14 @@ struct ToolboxView: View { } } + Section { + Link(destination: URLs.privacy.url) { + Text("Politique de confidentialité") + } + Link(destination: URLs.eula.url) { + Text("Contrat d'utilisation") + } + } } .overlay(alignment: .bottom) { if didResetApiCalls { diff --git a/PadelClub/Views/Tournament/Subscription/SubscriptionView.swift b/PadelClub/Views/Tournament/Subscription/SubscriptionView.swift index f55688b..a4e109f 100644 --- a/PadelClub/Views/Tournament/Subscription/SubscriptionView.swift +++ b/PadelClub/Views/Tournament/Subscription/SubscriptionView.swift @@ -162,7 +162,6 @@ struct SubscriptionView: View { .buttonStyle(.borderedProminent) .tint(.orange) .listRowBackground(Color.clear) - } footer: { if product.item.isConsumable == false { SubscriptionFooterView() @@ -187,14 +186,6 @@ struct SubscriptionView: View { self._restore() }.isLoading(self.isRestoring) } - - ToolbarItem(placement: .bottomBar) { - Button("Conditions d'utilisation") { - if let url = URL(string: URLs.sitePage(component: "terms-of-use/")) { - UIApplication.shared.open(url, options: [:], completionHandler: nil) - } - } - } } // .toolbar { @@ -272,6 +263,10 @@ fileprivate struct ProductsSectionView: View { } } header: { Text("Sélectionnez une offre").foregroundStyle(Color(white: 0.8)) + } footer: { + let message = "Consulter notre [politique de confidentialité](\(URLs.privacy.rawValue)) et le [contrat d'utilisation](\(URLs.eula.rawValue)) de Padel Club." + Text(.init(message)) + .foregroundStyle(.white) } } diff --git a/PadelClub/Views/User/UserCreationView.swift b/PadelClub/Views/User/UserCreationView.swift index cae2482..a20ebb4 100644 --- a/PadelClub/Views/User/UserCreationView.swift +++ b/PadelClub/Views/User/UserCreationView.swift @@ -142,10 +142,11 @@ struct UserCreationFormView: View { } Section { - Button("Conditions d'utilisation") { - if let url = URL(string: URLs.sitePage(component: "terms-of-use/")) { - UIApplication.shared.open(url, options: [:], completionHandler: nil) - } + Link(destination: URLs.privacy.url) { + Text("Politique de confidentialité") + } + Link(destination: URLs.eula.url) { + Text("Contrat d'utilisation") } Toggle(isOn: self.$dataCollectAuthorized) {