From f64f03a1cee99a39e60255e6a65080bc8a3d28ff Mon Sep 17 00:00:00 2001 From: ludelanier Date: Fri, 19 Jan 2024 23:35:51 +0100 Subject: [PATCH] Auto open particapte modal when clicking on Participate button --- Sources/AllInApp/AllIn/Components/BetCard.swift | 4 ++-- Sources/AllInApp/AllIn/Components/ParticipateButton.swift | 5 ++++- Sources/AllInApp/AllIn/Components/RecapBetCard.swift | 3 ++- Sources/AllInApp/AllIn/Components/ReviewCard.swift | 3 ++- Sources/AllInApp/AllIn/Views/DetailsView.swift | 7 ++++--- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Sources/AllInApp/AllIn/Components/BetCard.swift b/Sources/AllInApp/AllIn/Components/BetCard.swift index eac1299..f03f234 100644 --- a/Sources/AllInApp/AllIn/Components/BetCard.swift +++ b/Sources/AllInApp/AllIn/Components/BetCard.swift @@ -51,7 +51,7 @@ struct BetCard: View { Spacer() }.padding(0) - ParticipateButton(isOpen: $showParticipate).padding(.top, 5) + ParticipateButton(isOpen: $showDetails, isParticapatedOpen: $showParticipate).padding(.top, 5) } .frame(width: .infinity) .padding(.all,8) @@ -63,7 +63,7 @@ struct BetCard: View { showDetails.toggle() } .fullScreenCover(isPresented: $showDetails) { - DetailsView(isModalPresented: $showDetails, id: bet.id) + DetailsView(isModalPresented: $showDetails, isModalParticipated: $showParticipate,id: bet.id) } } } diff --git a/Sources/AllInApp/AllIn/Components/ParticipateButton.swift b/Sources/AllInApp/AllIn/Components/ParticipateButton.swift index 96648ec..126fa74 100644 --- a/Sources/AllInApp/AllIn/Components/ParticipateButton.swift +++ b/Sources/AllInApp/AllIn/Components/ParticipateButton.swift @@ -9,10 +9,13 @@ import SwiftUI struct ParticipateButton: View { @Binding var isOpen : Bool + @Binding var isParticapatedOpen: Bool @State var isDisabled: Bool = false + var body: some View { Button { - isOpen.toggle() + isOpen = true + isParticapatedOpen = true } label: { Text("Participer") .font(.system(size: 27)) diff --git a/Sources/AllInApp/AllIn/Components/RecapBetCard.swift b/Sources/AllInApp/AllIn/Components/RecapBetCard.swift index 440275c..b788b52 100644 --- a/Sources/AllInApp/AllIn/Components/RecapBetCard.swift +++ b/Sources/AllInApp/AllIn/Components/RecapBetCard.swift @@ -12,6 +12,7 @@ struct RecapBetCard: View { @GestureState private var longPressTap = false @State private var isPressed = false @State var showDetails: Bool = false + @State var showPartipated: Bool = false var body: some View { VStack(spacing: 0){ VStack(alignment: .leading,spacing: 2){ @@ -107,7 +108,7 @@ struct RecapBetCard: View { .onTapGesture { showDetails.toggle() }.fullScreenCover(isPresented: $showDetails) { - DetailsView(isModalPresented: $showDetails, id: "1") + DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated,id: "1") } .gesture( LongPressGesture(minimumDuration: 0.5) diff --git a/Sources/AllInApp/AllIn/Components/ReviewCard.swift b/Sources/AllInApp/AllIn/Components/ReviewCard.swift index 2798c36..1730ff8 100644 --- a/Sources/AllInApp/AllIn/Components/ReviewCard.swift +++ b/Sources/AllInApp/AllIn/Components/ReviewCard.swift @@ -9,6 +9,7 @@ import SwiftUI struct ReviewCard: View { @State var showDetails: Bool = false + @State var showPartipated: Bool = false var amountBetted: Int var isAWin: Bool @@ -70,7 +71,7 @@ struct ReviewCard: View { .onTapGesture { showDetails.toggle() }.fullScreenCover(isPresented: $showDetails) { - DetailsView(isModalPresented: $showDetails, id: "1") + DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: "1") } } } diff --git a/Sources/AllInApp/AllIn/Views/DetailsView.swift b/Sources/AllInApp/AllIn/Views/DetailsView.swift index 938487f..8701c81 100644 --- a/Sources/AllInApp/AllIn/Views/DetailsView.swift +++ b/Sources/AllInApp/AllIn/Views/DetailsView.swift @@ -3,7 +3,7 @@ import SwiftUI struct DetailsView: View { @Binding var isModalPresented: Bool - @State var isModalParticipated: Bool = false + @Binding var isModalParticipated: Bool @State var progressValue: Float = 0.2 var isFinished: Bool { viewModel.betDetail?.finalAnswer == nil ? false : true @@ -48,8 +48,9 @@ struct DetailsView: View { var id: String @StateObject private var viewModel: DetailsViewModel - init(isModalPresented: Binding, id: String) { + init(isModalPresented: Binding, isModalParticipated: Binding,id: String) { self._isModalPresented = isModalPresented + self._isModalParticipated = isModalParticipated self.id = id self._viewModel = StateObject(wrappedValue: DetailsViewModel(id: id)) } @@ -132,7 +133,7 @@ struct DetailsView: View { .background(AllInColors.componentBackgroundColor) .cornerRadius(15) - ParticipateButton(isOpen: $isModalParticipated, isDisabled: isDisabled).padding(10).disabled(isDisabled) + ParticipateButton(isOpen: $isModalPresented, isParticapatedOpen: $isModalParticipated,isDisabled: isDisabled ).padding(10).disabled(isDisabled) }