diff --git a/PadelClub/Views/Planning/PlanningSettingsView.swift b/PadelClub/Views/Planning/PlanningSettingsView.swift index a600e66..2ced50d 100644 --- a/PadelClub/Views/Planning/PlanningSettingsView.swift +++ b/PadelClub/Views/Planning/PlanningSettingsView.swift @@ -48,7 +48,7 @@ struct PlanningSettingsView: View { var body: some View { List { if tournament.payment == nil { - ImageInfoView() + PaymentStatusView() // SubscriptionInfoView() } diff --git a/PadelClub/Views/Tournament/Subscription/PaymentStatusView.swift b/PadelClub/Views/Tournament/Subscription/PaymentStatusView.swift index 9a59492..3e141e7 100644 --- a/PadelClub/Views/Tournament/Subscription/PaymentStatusView.swift +++ b/PadelClub/Views/Tournament/Subscription/PaymentStatusView.swift @@ -14,39 +14,20 @@ struct ImageInfoView: View { @State var text: String = "" @State var textColor: Color = .black @State var backgroundColor: Color = .blue.opacity(0.2) - - @State var textOnTap: String? = nil - + @State var showPopover: Bool = false var tip: (any Tip)? = nil var body: some View { - Group { - if #available(iOS 18.4, *) { - HStack { - Image(systemName: self.systemImage) - .font(.title) - .foregroundStyle(.white) - Text(self.text) - .foregroundStyle(self.textColor) - .fontWeight(.semibold) - .frame(maxWidth: .infinity) - }.popoverTip(self.tip) - } else { - HStack { - Image(systemName: self.systemImage) - .font(.title) - .foregroundStyle(.white) - Text(self.text) - .fontWeight(.semibold) - .frame(maxWidth: .infinity) - }.onTapGesture { - if self.tip != nil { - self.showPopover = true - } - } - } + HStack { + Image(systemName: self.systemImage) + .font(.title) + .foregroundStyle(.white) + Text(self.text) + .foregroundStyle(self.textColor) + .fontWeight(.semibold) + .frame(maxWidth: .infinity) } .alert("Message", isPresented: self.$showPopover, actions: { }, message: { if let tip { @@ -58,8 +39,7 @@ struct ImageInfoView: View { .frame(maxWidth: .infinity) .padding() .background(self.backgroundColor) - - .listRowInsets(EdgeInsets()) // Remove default insets + .listRowInsets(EdgeInsets()) } } @@ -76,10 +56,8 @@ struct PaymentStatusView: View { let end = remaining > 1 ? "s" : "" let text = "Tournoi offert (\(remaining) restant\(end))" ImageInfoView(systemImage: "gift.fill", text: text, tip: FreeTournamentTip()) -// TipView(FreeTournamentTip()).tipStyle(tint: nil, background: .blue.opacity(0.2)) case nil: ImageInfoView(systemImage: "exclamationmark.bubble.fill", text: "Veuillez souscrire à une offre pour convoquer ou entrer un résultat", textColor: .white, backgroundColor: .logoRed, tip: NoPaymentTip()) -// TipView(NoPaymentTip()).tipStyle(tint: nil, background: .logoRed) default: EmptyView() }