add list of user in detailview

Sources/AllInApp/AllIn/Assets.xcassets/BleueCoin.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 107 (1).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/PurpleAllCoin.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector (3).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Components/BetLineLoading.swift

@@ -6,13 +6,37 @@
 //
 
 import SwiftUI
+import Model
 
 struct BetLineLoading: View {
     
-    @Binding var value: Float
+    @State var participations: [Participation]
+    
+    var value: CGFloat {
+        let totalParticipations = participations.count
+        let numberOfYes = participations.filter { $0.response == "OUI" }.count
+        let numberOfNo = participations.filter { $0.response == "NON" }.count
+        if(numberOfNo == 0 && numberOfYes == 0){
+            return 0.5
+        }
+
+            return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
+        }
+    
+
+    
+    var yesParticipations: [Participation] {
+            return participations.filter { $0.response == "OUI" }
+        }
+        
+        var noParticipations: [Participation] {
+            return participations.filter { $0.response == "NON" }
+        }
+    
+    
     var body: some View {
         GeometryReader { geometry in
-            VStack(spacing: 0){
+            VStack(alignment: .leading,spacing: 0){
                 HStack(spacing: 5){
                     Text("OUI").font(.system(size: 25)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
                     Spacer()
@@ -36,31 +60,31 @@ struct BetLineLoading: View {
                 }
                 VStack(spacing: 1){
                     HStack(spacing: 5){
-                        Image("BleueBadge").resizable().frame(width:10, height: 14)
+                        Image("BlueAllCoinIcon").resizable().frame(width:12, height: 12)
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
+                        Text(yesParticipations.reduce(0, {x,y in x + y.stake}).description).font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
                         Spacer()
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
+                        Text(noParticipations.reduce(0, {x,y in x + y.stake}).description).font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
                         Image("PinkBadge").resizable().frame(width:10, height: 14)
 
                     }
                     HStack(spacing: 5){
-                        Image("BleueBadge").resizable().frame(width:10, height: 14)
+                        Image("BleuePersonIcon").resizable().frame(width:14, height: 12)
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
+                        Text(yesParticipations.count.description).font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
                         Spacer()
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
+                        Text(noParticipations.count.description).font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
                         Image("PinkBadge").resizable().frame(width:10, height: 14)
 
                     }
                     HStack(spacing: 5){
                         Image("BleueBadge").resizable().frame(width:10, height: 14)
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
+                        Text(yesParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
                         Spacer()
-                        Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
+                        Text(noParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
                         Image("PinkBadge").resizable().frame(width:10, height: 14)
 
                     }
                     HStack(spacing: 5){
-                        Image("BleueBadge").resizable().frame(width:10, height: 14)
+                        Image("BleueTrophyIcon").resizable().frame(width:14, height: 13)
                         Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.bleue200)
                         Spacer()
                         Text("1.2").font(.system(size: 15)).fontWeight(.bold).foregroundColor(AllInColors.pink100)
@@ -70,7 +94,7 @@ struct BetLineLoading: View {
                 }
             }
                     
-        }
+        }.frame(height: 140)
     }
 }
 

Sources/AllInApp/AllIn/Components/ParticiationCell.swift

@@ -0,0 +1,29 @@
+//
+//  ParticiationCell.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 21/01/2024.
+//
+
+import SwiftUI
+import Model
+
+struct ParticiationCell: View {
+    @State var participation: Participation?
+    var body: some View {
+        HStack(alignment: .center, spacing: 0){
+            Circle().frame(width: 30, height: 30).foregroundColor(AllInColors.grey700Color).padding(.trailing, 5)
+            Text(participation?.user.username ?? "Unknown")
+                .font(.system(size: 15))
+                .foregroundStyle(AllInColors.grey100Color)
+                .fontWeight(.semibold)
+            Spacer()
+            Text(participation?.stake.description ?? "NaN")
+                .font(.system(size: 18))
+                .foregroundStyle(AllInColors.lightPurpleColor)
+                .fontWeight(.bold).padding(.trailing, 5)
+            Image("PurpleAllCoin").resizable().frame(width: 11, height: 12)
+        }
+    }
+}
+

Sources/AllInApp/AllIn/Views/DetailsView.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Model
 
 struct DetailsView: View {
     
@@ -116,8 +117,17 @@ struct DetailsView: View {
                     if isFinished {
                         ResultBanner()
                     }
-                    VStack(alignment: .leading, spacing: 15) {
+                    VStack(alignment: .leading, spacing: 5) {
-                        BetLineLoading(value: $progressValue).padding(.vertical, 15)
+                        BetLineLoading(participations: viewModel.betDetail!.participations).padding(.vertical,15)
+                        Text("Liste des participants")
+                            .font(.system(size: 18))
+                            .foregroundStyle(AllInColors.grey100Color)
+                            .fontWeight(.bold)
+                            .padding(.bottom, 10)
+                        ForEach(viewModel.betDetail?.participations ?? []) { (participation: Participation) in
+                            ParticiationCell(participation: participation).padding(.horizontal, 10)
+                        }
+                        
                         Spacer()
                     }
                     .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/, maxHeight: .infinity)

Sources/AllInApp/AllInApp.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		1244EF602B4EC31E00374ABF /* HistoricBetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */; };
 		1244EF622B4EC67000374ABF /* ReviewCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF612B4EC67000374ABF /* ReviewCard.swift */; };
 		12C370482B5A5EE500CD9F0F /* BetLineLoading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */; };
+		12C3704A2B5D5BD000CD9F0F /* ParticiationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C370492B5D5BD000CD9F0F /* ParticiationCell.swift */; };
 		EC0193782B25BF16005D81E6 /* AllcoinsCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0193772B25BF16005D81E6 /* AllcoinsCapsule.swift */; };
 		EC01937A2B25C12B005D81E6 /* BetCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0193792B25C12B005D81E6 /* BetCard.swift */; };
 		EC01937C2B25C2A8005D81E6 /* AllcoinsCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC01937B2B25C2A8005D81E6 /* AllcoinsCounter.swift */; };
@@ -113,6 +114,7 @@
 		1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricBetView.swift; sourceTree = "<group>"; };
 		1244EF612B4EC67000374ABF /* ReviewCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewCard.swift; sourceTree = "<group>"; };
 		12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetLineLoading.swift; sourceTree = "<group>"; };
+		12C370492B5D5BD000CD9F0F /* ParticiationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticiationCell.swift; sourceTree = "<group>"; };
 		EC0193772B25BF16005D81E6 /* AllcoinsCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllcoinsCapsule.swift; sourceTree = "<group>"; };
 		EC0193792B25C12B005D81E6 /* BetCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetCard.swift; sourceTree = "<group>"; };
 		EC01937B2B25C2A8005D81E6 /* AllcoinsCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllcoinsCounter.swift; sourceTree = "<group>"; };
@@ -335,6 +337,7 @@
 				120919172B56D0AE00D0FA29 /* ParticipationModal.swift */,
 				120919192B56DC6C00D0FA29 /* DropDownAnswerMenu.swift */,
 				12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */,
+				12C370492B5D5BD000CD9F0F /* ParticiationCell.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -539,6 +542,7 @@
 				EC3077072B24CB840060E34D /* SplashView.swift in Sources */,
 				EC01937E2B25C52E005D81E6 /* TopBar.swift in Sources */,
 				ECA9D1CB2B2DA2320076E0EC /* DropDownFriends.swift in Sources */,
+				12C3704A2B5D5BD000CD9F0F /* ParticiationCell.swift in Sources */,
 				123590B82B5541BA00F7AEBD /* ParticipateButton.swift in Sources */,
 				EC01FCC32B56650400BB2390 /* DetailsViewModel.swift in Sources */,
 				ECB26A1B2B40746C00FE06B3 /* FriendsViewModel.swift in Sources */,

Sources/Model/Sources/Model/Bet.swift

@@ -90,4 +90,8 @@ public class Bet: ObservableObject, Identifiable {
         self.author = author
         self.registered = registered
     }
+    
+    public func addRegistered(newUser: User){
+        self.registered.append(newUser)
+    }
 }

Sources/Model/Sources/Model/BetDetail.swift

@@ -42,4 +42,14 @@ public class BetDetail: ObservableObject {
     public func updateFinalAnswer(newFinalAnswer: String) {
             self.finalAnswer = newFinalAnswer
         }
+    
+    public func addParticipation(newParticipation: Participation){
+        if !self.bet.registered.contains(where: { existingUser in
+            return existingUser.email == newParticipation.user.email
+        }) {
+                self.bet.addRegistered(newUser: newParticipation.user)
+            }
+
+            self.participations.append(newParticipation)
+    }
 }

Sources/Model/Sources/Model/Participation.swift

@@ -8,8 +8,9 @@
 import Foundation
 
 /// A class representing a user's participation in a bet.
-public class Participation: ObservableObject {
+public class Participation: ObservableObject, Identifiable{
     
+    public let id: UUID
     /// The amount of stake in the bet.
     public private(set) var stake: Int
     
@@ -39,5 +40,6 @@ public class Participation: ObservableObject {
         self.response = response
         self.user = user
         self.betId = betId
+        self.id = UUID()
     }
 }

Sources/StubLib/Sources/StubLib/Stub.swift

@@ -88,6 +88,12 @@ struct Stub {
             let betDetail = BetDetail(bet: bet, answers: [], participations: [], userParticipation: Participation(stake: 0, date: Date(), response: "", user: user1, betId: ""))
             self.betsDetail.append(betDetail)
         }
+        
+        self.betsDetail[0].addParticipation(newParticipation: Participation(stake: 120, date: Date(), response: "OUI", user: user1, betId: "1"))
+        self.betsDetail[0].addParticipation(newParticipation: Participation(stake: 20, date: Date(), response: "NON", user: user2, betId: "2"))
+        self.betsDetail[0].addParticipation(newParticipation: Participation(stake: 320, date: Date(), response: "OUI", user: user3, betId: "3"))
+        self.betsDetail[0].addParticipation(newParticipation: Participation(stake: 320, date: Date(), response: "OUI", user: user3, betId: "3"))
+        
     }
     
     public mutating func add(bet: Bet) {