diff --git a/Sources/AllInApp/AllIn/Assets.xcassets/Grey100Color.colorset/Contents.json b/Sources/AllInApp/AllIn/Assets.xcassets/Grey100Color.colorset/Contents.json index cf9f629..806eef5 100644 --- a/Sources/AllInApp/AllIn/Assets.xcassets/Grey100Color.colorset/Contents.json +++ b/Sources/AllInApp/AllIn/Assets.xcassets/Grey100Color.colorset/Contents.json @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x45", - "green" : "0x45", - "red" : "0x45" + "blue" : "0xCF", + "green" : "0xCF", + "red" : "0xCF" } }, "idiom" : "universal" diff --git a/Sources/AllInApp/AllIn/Components/BetCard.swift b/Sources/AllInApp/AllIn/Components/BetCard.swift index f03f234..b8ca216 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: $showDetails, isParticapatedOpen: $showParticipate).padding(.top, 5) + ParticipateButton(isOpen: $showDetails, isParticapatedOpen: $showParticipate, bet: bet).padding(.top, 5) } .frame(width: .infinity) .padding(.all,8) diff --git a/Sources/AllInApp/AllIn/Components/ParticipateButton.swift b/Sources/AllInApp/AllIn/Components/ParticipateButton.swift index 126fa74..cdb3ea8 100644 --- a/Sources/AllInApp/AllIn/Components/ParticipateButton.swift +++ b/Sources/AllInApp/AllIn/Components/ParticipateButton.swift @@ -6,11 +6,31 @@ // import SwiftUI +import Model struct ParticipateButton: View { @Binding var isOpen : Bool @Binding var isParticapatedOpen: Bool - @State var isDisabled: Bool = false + @State var bet: Bet? + + var isDisabled: Bool { + let endRegisterDate: Date? = bet?.endRegisterDate + if endRegisterDate != nil{ + let currentDate = Date() + + switch currentDate.compare(endRegisterDate!) { + case .orderedAscending: + return false + case .orderedDescending: + return true + case .orderedSame: + return true + } + + } else { + return true + } + } var body: some View { Button { @@ -51,6 +71,6 @@ struct ParticipateButton: View { ) - } + }.disabled(isDisabled) } } diff --git a/Sources/AllInApp/AllIn/Views/DetailsView.swift b/Sources/AllInApp/AllIn/Views/DetailsView.swift index fdf23ca..8266de9 100644 --- a/Sources/AllInApp/AllIn/Views/DetailsView.swift +++ b/Sources/AllInApp/AllIn/Views/DetailsView.swift @@ -143,7 +143,7 @@ struct DetailsView: View { .background(AllInColors.componentBackgroundColor) .cornerRadius(15) - ParticipateButton(isOpen: $isModalPresented, isParticapatedOpen: $isModalParticipated,isDisabled: isDisabled ).padding(10).disabled(isDisabled) + ParticipateButton(isOpen: $isModalPresented, isParticapatedOpen: $isModalParticipated,bet: viewModel.betDetail?.bet ).padding(10) }