merge conflits

Conflicts:
	Sources/AllInApp/AllIn/Components/Friend.swift
	Sources/AllInApp/AllIn/Components/Menu.swift
	Sources/AllInApp/AllIn/Components/ParticipationCell.swift
	Sources/AllInApp/AllIn/Views/DetailsView.swift
	Sources/Api/Sources/Api/BetApiManager.swift

Sources/AllInApp/AllIn/AllIn.entitlements

@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
+	<array/>
-		<string>group.alldev.AllIn</string>
-	</array>
 </dict>
 </plist>

Sources/AllInApp/AllIn/Components/BetCard.swift

@@ -44,7 +44,7 @@ struct BetCard: View {
             VStack(alignment: .leading,spacing: 2){
                 HStack{
                     Spacer()
-                    UsersPreview()
+                    UsersPreview(users: bet.registered)
                     Text("bet_players_waiting_format \(bet.registered.count.description)")
                         .font(.system(size: 15))
                         .foregroundColor(AllInColors.grey800Color)

Sources/AllInApp/AllIn/Components/DropDownFriends.swift

@@ -52,7 +52,7 @@ struct DropDownFriends: View {
                                     )
                                     .frame(width: 15, height: 15)
                                     .padding(.trailing, 5)
-                                UserInfo()
+                                UserInfo(username: "", value: 0)
                                     .contentShape(Rectangle())
                             }
                             .padding([.leading, .trailing], 15)

Sources/AllInApp/AllIn/Components/Friend.swift

@@ -29,10 +29,7 @@ struct Friend: View {
     
     var body: some View {
         HStack{
-            AsyncImage(url: URL(string: user.image ?? ""))
+            UserPicture(picture: nil,username: user.username, size: 45)
-                .frame(width: 50, height: 50)
-                .cornerRadius(180)
-                .scaledToFit()
             Text(user.username)
                 .fontWeight(.medium)
                 .padding(.leading, 5)

Sources/AllInApp/AllIn/Components/Menu.swift

@@ -11,6 +11,7 @@ import DependencyInjection
 struct Menu: View {
     
     @Inject var authService: IAuthService
+
     
     let parameters: [(String, String, String, String)] = [
         ("videoGameImage", String(localized: "drawer_create_a_bet"), String(localized: "drawer_create_a_bet_subtitle"), "CreationBet"),
@@ -27,10 +28,7 @@ struct Menu: View {
             HStack() {
                 Spacer()
                 VStack(){
-                    AsyncImage(url: URL(string: AppStateContainer.shared.user?.image ?? ""))
+                    UserPicture(username: (AppStateContainer.shared.user?.username)!, size: 100)
-                        .scaledToFit()
-                        .frame(width: 100, height: 100)
-                        .cornerRadius(180)
                     Text(AppStateContainer.shared.user?.username.capitalized ?? "")
                         .fontWeight(.medium)
                         .font(.system(size: 17))

Sources/AllInApp/AllIn/Components/ParticipationCell.swift

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

Sources/AllInApp/AllIn/Components/RankingRow.swift

@@ -19,24 +19,7 @@ struct RankingRow: View {
             Text(number.description)
                 .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 18)
                 .padding(.leading, 15)
-            
+            UserInfo(username: pseudo, value: allCoins)
-            Image(image)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 40, height: 40)
-                .cornerRadius(180)
-                .padding([.bottom,.top], 10)
-            Text(pseudo)
-                .fontWeight(.medium)
-                .font(.system(size: 16))
-                .lineLimit(1)
-            Spacer()
-            Image("allcoinIcon")
-                .resizable()
-                .frame(width: 17, height: 17, alignment: .leading)
-            Text(allCoins.description)
-                .textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
-                .padding(.trailing, 15)
         }
         .background(AllInColors.componentBackgroundColor)
         .cornerRadius(8)

Sources/AllInApp/AllIn/Components/UserInfo.swift

@@ -6,27 +6,28 @@
 //
 
 import SwiftUI
+import Model
 
 struct UserInfo: View {
+    var username: String
+    var value: Int
     var body: some View {
         HStack {
-            Image("defaultUserImage")
+            UserPicture(username: username, size: 35)
-                .resizable()
+                .padding(.trailing, 7)
-                .frame(width: 35, height: 35)
+            Text(username)
-            Text("David")
+                .font(.system(size: 15))
-                .textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 13)
+                .foregroundStyle(AllInColors.primaryTextColor)
+                .fontWeight(.semibold)
             Spacer()
-            Image("allcoinIcon")
+            Text(value.description)
+                .font(.system(size: 18))
+                .foregroundStyle(AllInColors.lightPurpleColor)
+                .fontWeight(.bold)
+                .padding(.trailing, 8)
+            Image("PurpleAllCoin")
                 .resizable()
-                .frame(width: 17, height: 17, alignment: .leading)
+                .frame(width: 11, height: 12)
-            Text("541")
-                .textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
         }
     }
 }
-
-struct UserInfo_Previews: PreviewProvider {
-    static var previews: some View {
-        UserInfo()
-    }
-}

Sources/AllInApp/AllIn/Components/UsersPreview.swift

@@ -6,22 +6,19 @@
 //
 
 import SwiftUI
+import Model
 
 struct UsersPreview: View {
+    var users: [User]?
     var body: some View {
-        HStack(spacing: -20){
+        if users != nil {
-            Image("defaultUserImage")
+            HStack(spacing: -20){
-                .resizable()
+                ForEach(users!.prefix(4)) { user in
-                .frame(width: 35, height: 35)
+                    Image("defaultUserImage")
-            Image("defaultUserImage")
+                        .resizable()
-                .resizable()
+                        .frame(width: 35, height: 35)
-                .frame(width: 35, height: 35)
+                }
-            Image("defaultUserImage")
+            }
-                .resizable()
-                .frame(width: 35, height: 35)
-            Image("defaultUserImage")
-                .resizable()
-                .frame(width: 35, height: 35)
         }
     }
 }

Sources/AllInApp/AllIn/Components/userPicture.swift

@@ -0,0 +1,53 @@
+//
+//  userPicture.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 04/06/2024.
+//
+
+import SwiftUI
+
+struct UserPicture: View {
+    var picture: URL?
+    var username: String
+    var size: CGFloat
+    var body: some View {
+        ZStack {
+            if picture != nil {
+                AsyncImage(
+                    url: picture,
+                    content: { image in
+                        image
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .clipShape(Circle())
+                    },
+                    placeholder: {
+                        ProgressView()
+                    }
+                )
+            } else {
+                Circle()
+                    .foregroundColor(.gray)
+                    .frame(width: size, height: size)
+                    .overlay(
+                        Text(username.prefix(2).uppercased())
+                            .fontWeight(.medium)
+                            .foregroundStyle(.white)
+                            .font(.system(size: fontSize(for: size)))
+                    )
+            }
+        }
+    }
+    
+    func fontSize(for diameter: CGFloat) -> CGFloat {
+        let fontScaleFactor: CGFloat = 0.45
+        return diameter * fontScaleFactor
+    }
+}
+
+struct UserPicture_Previews: PreviewProvider {
+    static var previews: some View {
+        UserPicture(picture: nil, username: "Lucas", size: 100)
+    }
+}

Sources/AllInApp/AllIn/Views/DetailsView.swift

@@ -121,9 +121,8 @@ struct DetailsView: View {
                             .fontWeight(.bold)
                             .padding(.bottom, 10)
                         ScrollView(showsIndicators: false) {
-                            ForEach(viewModel.betDetail?.participations ?? [], id: \.self) { participation in
+                            ForEach(viewModel.betDetail?.participations ?? []) { participation in
-                                ParticipationCell(participation: participation)
+                                UserInfo(username: participation.username, value: participation.stake).padding(.horizontal, 10)
-                                    .padding(.horizontal, 10)
                             }
                         }
                         .padding(.bottom, geometry.safeAreaInsets.bottom + 28)

Sources/AllInApp/AllIn/Views/RankingView.swift

@@ -51,12 +51,7 @@ struct RankingView: View {
                             .cornerRadius(41.5, corners: .topLeft)
                             .cornerRadius(8, corners: .topRight)
                             .cornerRadius(15, corners: [.bottomLeft, .bottomRight])
-                            
+                            UserPicture(picture: nil, username: viewModel.friends[0].username, size: 70)
-                            Image("defaultUserImage")
-                                .resizable()
-                                .frame(width: 70, height: 70)
-                                .scaledToFit()
-                                .cornerRadius(180)
                                 .offset(x: 0, y: -55)
                             
                             Text("1")
@@ -100,11 +95,7 @@ struct RankingView: View {
                             .cornerRadius(8, corners: .topLeft)
                             .cornerRadius(15, corners: [.bottomLeft, .bottomRight])
                             
-                            Image("defaultUserImage")
+                            UserPicture(picture: nil, username: viewModel.friends[1].username, size: 50)
-                                .resizable()
-                                .frame(width: 50, height: 50)
-                                .scaledToFit()
-                                .cornerRadius(180)
                                 .offset(x: 0, y: -50)
                             
                             Text("2")

Sources/AllInApp/AllInApp.xcodeproj/project.pbxproj

@@ -14,12 +14,12 @@
 		123590B42B51792000F7AEBD /* DetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B32B51792000F7AEBD /* DetailsView.swift */; };
 		123590B62B5537E200F7AEBD /* ResultBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B52B5537E200F7AEBD /* ResultBanner.swift */; };
 		123590B82B5541BA00F7AEBD /* ParticipateButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123590B72B5541BA00F7AEBD /* ParticipateButton.swift */; };
+		123F31DB2C0F26E8009B6D65 /* userPicture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123F31DA2C0F26E8009B6D65 /* userPicture.swift */; };
 		1244EF602B4EC31E00374ABF /* HistoricBetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */; };
 		1244EF622B4EC67000374ABF /* ReviewCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF612B4EC67000374ABF /* ReviewCard.swift */; };
 		129D051D2B6E7FF0003D3E08 /* OddCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */; };
 		12A9E4942C07132600AB8677 /* EmptyInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12A9E4932C07132600AB8677 /* EmptyInfo.swift */; };
 		12C370482B5A5EE500CD9F0F /* BetLineLoading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */; };
-		12C3704A2B5D5BD000CD9F0F /* ParticipationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C370492B5D5BD000CD9F0F /* ParticipationCell.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 */; };
@@ -153,12 +153,12 @@
 		123590B32B51792000F7AEBD /* DetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailsView.swift; sourceTree = "<group>"; };
 		123590B52B5537E200F7AEBD /* ResultBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultBanner.swift; sourceTree = "<group>"; };
 		123590B72B5541BA00F7AEBD /* ParticipateButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipateButton.swift; sourceTree = "<group>"; };
+		123F31DA2C0F26E8009B6D65 /* userPicture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = userPicture.swift; sourceTree = "<group>"; };
 		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>"; };
 		129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OddCapsule.swift; sourceTree = "<group>"; };
 		12A9E4932C07132600AB8677 /* EmptyInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyInfo.swift; sourceTree = "<group>"; };
 		12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetLineLoading.swift; sourceTree = "<group>"; };
-		12C370492B5D5BD000CD9F0F /* ParticipationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipationCell.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>"; };
@@ -429,10 +429,10 @@
 				120919172B56D0AE00D0FA29 /* ParticipationModal.swift */,
 				120919192B56DC6C00D0FA29 /* DropDownAnswerMenu.swift */,
 				12C370472B5A5EE500CD9F0F /* BetLineLoading.swift */,
-				12C370492B5D5BD000CD9F0F /* ParticipationCell.swift */,
 				123225DA2B67E41400D30BB3 /* ChoiceFinalAnswerCell.swift */,
 				129D051C2B6E7FF0003D3E08 /* OddCapsule.swift */,
 				12A9E4932C07132600AB8677 /* EmptyInfo.swift */,
+				123F31DA2C0F26E8009B6D65 /* userPicture.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -669,6 +669,7 @@
 				EC89F7BD2B250D66003821CE /* LoginView.swift in Sources */,
 				EC650A442B25CDF3003AFCAD /* ParameterMenu.swift in Sources */,
 				120919182B56D0AE00D0FA29 /* ParticipationModal.swift in Sources */,
+				123F31DB2C0F26E8009B6D65 /* userPicture.swift in Sources */,
 				ECB26A132B406A9400FE06B3 /* BetViewModel.swift in Sources */,
 				EC30770F2B24FCB00060E34D /* RegisterView.swift in Sources */,
 				EC650A522B2794DD003AFCAD /* BetView.swift in Sources */,
@@ -707,7 +708,6 @@
 				EC3077072B24CB840060E34D /* SplashView.swift in Sources */,
 				EC01937E2B25C52E005D81E6 /* TopBar.swift in Sources */,
 				ECA9D1CB2B2DA2320076E0EC /* DropDownFriends.swift in Sources */,
-				12C3704A2B5D5BD000CD9F0F /* ParticipationCell.swift in Sources */,
 				123590B82B5541BA00F7AEBD /* ParticipateButton.swift in Sources */,
 				EC01FCC32B56650400BB2390 /* DetailsViewModel.swift in Sources */,
 				ECB26A1B2B40746C00FE06B3 /* FriendsViewModel.swift in Sources */,
@@ -916,7 +916,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"AllIn/Preview Content\"";
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "All In";
@@ -950,7 +950,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"AllIn/Preview Content\"";
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "All In";
@@ -1054,7 +1054,7 @@
 				CODE_SIGN_ENTITLEMENTS = AllInWidgetsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AllInWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AllInWidgets;
@@ -1082,7 +1082,7 @@
 				CODE_SIGN_ENTITLEMENTS = AllInWidgetsExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = P39ZK4GA2T;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AllInWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = AllInWidgets;

Sources/AllInApp/AllInWidgetsExtension.entitlements

@@ -3,8 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array>
+	<array/>
-		<string>group.alldev.AllIn</string>
-	</array>
 </dict>
 </plist>

Sources/DependencyInjection/DependencyInjection.xcodeproj/project.pbxproj

@@ -339,9 +339,11 @@
 		ECEE18C82B3C9CF400C95E8A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -376,9 +378,11 @@
 		ECEE18C92B3C9CF400C95E8A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -416,6 +420,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
@@ -436,6 +441,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 35KQ5BDC64;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				MACOSX_DEPLOYMENT_TARGET = 13.3;

Sources/Model/Sources/Model/User.swift

@@ -8,8 +8,11 @@
 import Foundation
 
 /// A struct representing a user with details such as username, email, number of coins, and friends.
-public struct User: Codable, Hashable {
+public struct User: Codable, Hashable, Identifiable {
     
+    public var id: String {
+            return email
+    }
     /// The username of the user.
     public private(set) var username: String