AllDev
/
Apple
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix multiple issues with floats, responsive etc

Browse Source
fix/multiples-fix
Lucas DELANIER 10 months ago
parent b97254d000
commit d5e50e4168
10 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
Sources/AllInApp/AllIn/Components/BinaryBetLine.swift
Unescape View File

@ -52,13 +52,13 @@ struct BinaryBetLine: View {
HStack{ HStack{
Spacer() Spacer()
Rectangle() Rectangle()
.frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width), height: 17) .frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999) .foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999)
} }
HStack(spacing: 0) { HStack(spacing: 0) {
Rectangle() Rectangle()
.frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width), height: 17) .frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(AllInColors.BlueBetGradiant) .foregroundStyle(AllInColors.BlueBetGradiant)
.cornerRadius(999) .cornerRadius(999)
Image("loadingHeartIcon") Image("loadingHeartIcon")

2
Sources/AllInApp/AllIn/Components/CustomBetLine.swift
Unescape View File

@ -57,7 +57,7 @@ struct CustomBetLine: View {
ZStack(alignment: .leading) { ZStack(alignment: .leading) {
HStack(spacing: 0) { HStack(spacing: 0) {
Rectangle() Rectangle()
.frame(width: min(percentage * geometry.size.width, geometry.size.width), height: 17) .frame(width: min(percentage * geometry.size.width, geometry.size.width-20), height: 17)
.foregroundStyle(getGradiant(for: answer)) .foregroundStyle(getGradiant(for: answer))
.cornerRadius(999, corners: [.topLeft, .bottomLeft]) .cornerRadius(999, corners: [.topLeft, .bottomLeft])
Image(getFlameImage(for: answer)) Image(getFlameImage(for: answer))

4
Sources/AllInApp/AllIn/Components/DropDownAnswerMenu.swift
Unescape View File

@ -20,7 +20,7 @@ struct DropDownAnswerMenu: View {
HStack{ HStack{
Text(selectedAnswer.response) Text(selectedAnswer.response)
.textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20) .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
Text(selectedAnswer.odds.description) Text("\(selectedAnswer.odds, specifier: "%.2f")")
.textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10) .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
Spacer() Spacer()
@ -44,7 +44,7 @@ struct DropDownAnswerMenu: View {
HStack{ HStack{
Text(answer.response) Text(answer.response)
.textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20) .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
Text(answer.odds.description) Text("\(answer.odds, specifier: "%.2f")")
.textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10) .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
Spacer() Spacer()
} }

2
Sources/AllInApp/AllIn/Components/OddCapsule.swift
Unescape View File

@ -14,7 +14,7 @@ struct OddCapsule: View {
var odd: Float = 0.0 var odd: Float = 0.0
var body: some View { var body: some View {
HStack(alignment: .center) { HStack(alignment: .center) {
Text("x\(odd.description)") Text("x\(odd, specifier: "%.2f")")
.fontWeight(.bold) .fontWeight(.bold)
.foregroundColor(foregroundColor) .foregroundColor(foregroundColor)
} }

5
Sources/AllInApp/AllIn/Components/RecapBetCard.swift
Unescape View File

@ -73,7 +73,7 @@ struct RecapBetCard: View {
.overlay { .overlay {
AllInColors.primaryGradient.frame(width: 50) AllInColors.primaryGradient.frame(width: 50)
.mask( .mask(
Text("1630").font(.system(size: 15)).fontWeight(.medium) Text(betResult.amount.description).font(.system(size: 15)).fontWeight(.medium)
) )
} }
.padding(0) .padding(0)
@ -89,7 +89,8 @@ struct RecapBetCard: View {
HStack{ HStack{
Text("Côte totale").font(.system(size: 15)).fontWeight(.medium) Text("Côte totale").font(.system(size: 15)).fontWeight(.medium)
Spacer() Spacer()
Text("3,46") // TODO bind le odd
Text("1,0")
.textStyle(weight: .bold, color: .white, size: 18) .textStyle(weight: .bold, color: .white, size: 18)
.padding([.leading,.trailing],10) .padding([.leading,.trailing],10)
.padding([.top,.bottom],5) .padding([.top,.bottom],5)

8
Sources/AllInApp/AllIn/Components/ResultBanner.swift
Unescape View File

@ -19,16 +19,16 @@ struct ResultBanner: View {
}.frame(height: 80) }.frame(height: 80)
HStack(spacing: 20){ HStack(spacing: 20){
HStack{ HStack{
Image("BlueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12) Image("blueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12)
Text(finalAnswer.stake.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color) Text(finalAnswer.stake.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
} }
HStack{ HStack{
Image("BleuePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12) Image("bluePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
Text(finalAnswer.username).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color) Text(finalAnswer.username).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
} }
HStack{ HStack{
Image("BleueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12) Image("blueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
Text(odds.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color) Text("\(odds, specifier: "%.2f")").font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
} }
} }
} }

16
Sources/AllInApp/AllIn/Components/ReviewCard.swift
Unescape View File

@ -42,13 +42,15 @@ struct ReviewCard: View {
VStack(alignment: .center,spacing:0){ VStack(alignment: .center,spacing:0){
HStack(){ HStack(){
Spacer() Spacer()
Text(amount.description) if bet.status == .finished {
.foregroundColor(.white) Text(amount.description)
.font(.system(size: 25)) .foregroundColor(.white)
.fontWeight(.bold) .font(.system(size: 25))
Image("allcoinWhiteIcon") .fontWeight(.bold)
.resizable() Image("allcoinWhiteIcon")
.frame(width: 18, height: 20) .resizable()
.frame(width: 18, height: 20)
}
switch bet.status { switch bet.status {
case .waiting, .inProgress: case .waiting, .inProgress:

3
Sources/AllInApp/AllIn/ViewModels/BetViewModel.swift
Unescape View File

@ -13,7 +13,7 @@ import Combine
class BetViewModel: ObservableObject { class BetViewModel: ObservableObject {
@Inject var manager: Manager @Inject var manager: Manager
@Inject var authService: IAuthService
@Published var popularBet: Bet? @Published var popularBet: Bet?
@Published private(set) var bets: [Bet] = [] @Published private(set) var bets: [Bet] = []
@Published var betsOver: [BetDetail] = [] @Published var betsOver: [BetDetail] = []
@ -58,6 +58,7 @@ class BetViewModel: ObservableObject {
self.betsWon = bets self.betsWon = bets
if !self.betsWon.isEmpty { if !self.betsWon.isEmpty {
self.showingSheetWon = true self.showingSheetWon = true
self.authService.refreshAuthentication()
} }
} }
} }

4
Sources/AllInApp/AllIn/Views/DetailsView.swift
Unescape View File

@ -6,6 +6,7 @@ struct DetailsView: View {
@Binding var isModalPresented: Bool @Binding var isModalPresented: Bool
@Binding var isModalParticipated: Bool @Binding var isModalParticipated: Bool
@StateObject private var viewModel: DetailsViewModel @StateObject private var viewModel: DetailsViewModel
@State private var isLoading = true
var isFinished: Bool { var isFinished: Bool {
viewModel.betDetail?.wonParticipation == nil ? false : true viewModel.betDetail?.wonParticipation == nil ? false : true
@ -59,7 +60,7 @@ struct DetailsView: View {
.background(StatusValues.1) .background(StatusValues.1)
if viewModel.betDetail != nil{ if viewModel.betDetail != nil{
ScrollView { ScrollView {
VStack(alignment: .leading, spacing: 5) { VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 3) { HStack(spacing: 3) {
Spacer() Spacer()
Text("bet_proposed_by_format") Text("bet_proposed_by_format")
@ -132,6 +133,7 @@ struct DetailsView: View {
Spacer() Spacer()
} }
.padding([.trailing,.leading], 15) .padding([.trailing,.leading], 15)
.padding(.bottom, 100)
} }
.frame(maxWidth: .infinity, maxHeight: (geometry.size.height + geometry.safeAreaInsets.bottom) - 50) .frame(maxWidth: .infinity, maxHeight: (geometry.size.height + geometry.safeAreaInsets.bottom) - 50)

30
Sources/AllInApp/AllIn/Views/FriendsView.swift
Unescape View File

@ -64,22 +64,26 @@ struct FriendsView: View {
} }
.padding(.top, 50) .padding(.top, 50)
.tag(0) .tag(0)
VStack(alignment: .center, spacing: 0) { ScrollView{
if(viewModel.requests.isEmpty){ VStack(alignment: .center, spacing: 0) {
EmptyInfo(emoji:"📬", title: "Aucune demande d'amis en attente", explain: "").padding(.top, 40) if(viewModel.requests.isEmpty){
} EmptyInfo(emoji:"📬", title: "Aucune demande d'amis en attente", explain: "").padding(.top, 40)
else{
ScrollView(showsIndicators: false){
ForEach(viewModel.requests, id: \.self) { request in
Friend(user: request, isRequest: true, viewModel: viewModel)
}
} }
.refreshable { else{
viewModel.getRequests() ScrollView(showsIndicators: false){
ForEach(viewModel.requests, id: \.self) { request in
Friend(user: request, isRequest: true, viewModel: viewModel)
}
}
.refreshable {
viewModel.getRequests()
}
.padding(.top, 25)
} }
.padding(.top, 25) Spacer()
} }
Spacer() }.refreshable {
viewModel.getRequests()
} }
.padding(.top, 50) .padding(.top, 50)
.tag(1) .tag(1)

Write Preview
Loading…
Cancel
Save