From fc3708fbc3640e819c1835f0e981d527cf6c188e Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 6 Dec 2024 20:21:17 +0100 Subject: [PATCH] fix mobile number detection --- PadelClub/Extensions/String+Extensions.swift | 3 +-- .../Views/Calling/Components/PlayersWithoutContactView.swift | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/PadelClub/Extensions/String+Extensions.swift b/PadelClub/Extensions/String+Extensions.swift index 37094b9..4655383 100644 --- a/PadelClub/Extensions/String+Extensions.swift +++ b/PadelClub/Extensions/String+Extensions.swift @@ -166,8 +166,7 @@ extension String { // MARK: - FFT Source Importing extension String { enum RegexStatic { - static let mobileNumber = /^0[6-7]/ - //static let mobileNumber = /^(?:(?:\+|00)33[\s.-]{0,3}(?:\(0\)[\s.-]{0,3})?|0)[1-9](?:(?:[\s.-]?\d{2}){4}|\d{2}(?:[\s.-]?\d{3}){2})$/ + static let mobileNumber = /^(?:\+33|0033|0)[6-7](?:[ .-]?[0-9]{2}){4}$/ } func isMobileNumber() -> Bool { diff --git a/PadelClub/Views/Calling/Components/PlayersWithoutContactView.swift b/PadelClub/Views/Calling/Components/PlayersWithoutContactView.swift index 4e8d78e..cffae6e 100644 --- a/PadelClub/Views/Calling/Components/PlayersWithoutContactView.swift +++ b/PadelClub/Views/Calling/Components/PlayersWithoutContactView.swift @@ -31,7 +31,7 @@ struct PlayersWithoutContactView: View { } } - let withoutPhones = players.filter({ $0.phoneNumber?.isEmpty == true || $0.phoneNumber == nil }) + let withoutPhones = players.filter({ $0.phoneNumber?.isEmpty == true || $0.phoneNumber == nil || $0.phoneNumber?.isMobileNumber() == false }) DisclosureGroup { ForEach(withoutPhones) { player in NavigationLink { @@ -45,7 +45,7 @@ struct PlayersWithoutContactView: View { LabeledContent { Text(withoutPhones.count.formatted()) } label: { - Text("Joueurs sans téléphone") + Text("Joueurs sans téléphone portable") } } } header: {