From ca1f4a9814a878685f565abba169894633544aa1 Mon Sep 17 00:00:00 2001
From: "emre.kartal" <emre.kartal@etu.uca.fr>
Date: Thu, 19 Oct 2023 18:32:51 +0200
Subject: [PATCH] Add DropDownMenuView

---
 Sources/allin/allin.xcodeproj/project.pbxproj |   4 +
 .../GrayTextColor.colorset/Contents.json      |  38 ++++
 .../chevron_down.imageset/Contents.json       |  21 +++
 .../chevron_down.imageset/chevron_down.png    | Bin 0 -> 2229 bytes
 .../chevron_up.imageset/Contents.json         |  21 +++
 .../chevron_up.imageset/chevron_up.png        | Bin 0 -> 2147 bytes
 Sources/allin/allin/ContentView.swift         |   2 +-
 Sources/allin/allin/Ressources/Colors.swift   |   1 +
 .../allin/Screens/CreationBetScreen.swift     | 166 ++++++++++--------
 .../allin/allin/Screens/RegisterScreen.swift  |   7 +-
 .../allin/allin/Views/DropDownMenuView.swift  |  61 +++++++
 Sources/allin/allin/allinApp.swift            |   2 -
 12 files changed, 238 insertions(+), 85 deletions(-)
 create mode 100644 Sources/allin/allin/Assets.xcassets/GrayTextColor.colorset/Contents.json
 create mode 100644 Sources/allin/allin/Assets.xcassets/chevron_down.imageset/Contents.json
 create mode 100644 Sources/allin/allin/Assets.xcassets/chevron_down.imageset/chevron_down.png
 create mode 100644 Sources/allin/allin/Assets.xcassets/chevron_up.imageset/Contents.json
 create mode 100644 Sources/allin/allin/Assets.xcassets/chevron_up.imageset/chevron_up.png
 create mode 100644 Sources/allin/allin/Views/DropDownMenuView.swift

diff --git a/Sources/allin/allin.xcodeproj/project.pbxproj b/Sources/allin/allin.xcodeproj/project.pbxproj
index 30fc174..b8c045a 100644
--- a/Sources/allin/allin.xcodeproj/project.pbxproj
+++ b/Sources/allin/allin.xcodeproj/project.pbxproj
@@ -25,6 +25,7 @@
 		EC3737E62AC41DB000E6BDB5 /* WinModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3737E52AC41DB000E6BDB5 /* WinModal.swift */; };
 		EC3737E82AC5A53B00E6BDB5 /* AllcoinsCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3737E72AC5A53B00E6BDB5 /* AllcoinsCapsule.swift */; };
 		EC3737EA2AC5A58B00E6BDB5 /* RecapBetCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3737E92AC5A58B00E6BDB5 /* RecapBetCard.swift */; };
+		EC4163512AE126B3001E620D /* DropDownMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4163502AE126B3001E620D /* DropDownMenuView.swift */; };
 		EC46D7DD2ABCCC270030AC04 /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DC2ABCCC270030AC04 /* MenuView.swift */; };
 		EC46D7DF2ABCE0A20030AC04 /* ParameterMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */; };
 		EC50BF962ABF4D3300197685 /* SplashScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC50BF952ABF4D3300197685 /* SplashScreen.swift */; };
@@ -85,6 +86,7 @@
 		EC3737E52AC41DB000E6BDB5 /* WinModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WinModal.swift; path = allin/Screens/WinModal.swift; sourceTree = SOURCE_ROOT; };
 		EC3737E72AC5A53B00E6BDB5 /* AllcoinsCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AllcoinsCapsule.swift; path = allin/Views/AllcoinsCapsule.swift; sourceTree = SOURCE_ROOT; };
 		EC3737E92AC5A58B00E6BDB5 /* RecapBetCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RecapBetCard.swift; path = allin/Views/RecapBetCard.swift; sourceTree = SOURCE_ROOT; };
+		EC4163502AE126B3001E620D /* DropDownMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DropDownMenuView.swift; path = allin/Views/DropDownMenuView.swift; sourceTree = SOURCE_ROOT; };
 		EC46D7DC2ABCCC270030AC04 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuView.swift; path = allin/Views/MenuView.swift; sourceTree = SOURCE_ROOT; };
 		EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ParameterMenuView.swift; path = allin/Views/ParameterMenuView.swift; sourceTree = SOURCE_ROOT; };
 		EC50BF952ABF4D3300197685 /* SplashScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SplashScreen.swift; path = allin/Screens/SplashScreen.swift; sourceTree = SOURCE_ROOT; };
@@ -147,6 +149,7 @@
 				EC3737E72AC5A53B00E6BDB5 /* AllcoinsCapsule.swift */,
 				EC3737E92AC5A58B00E6BDB5 /* RecapBetCard.swift */,
 				EC31955D2ACD3B8E00D0A4DC /* ConfidentialityView.swift */,
+				EC4163502AE126B3001E620D /* DropDownMenuView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -416,6 +419,7 @@
 				EC3737EA2AC5A58B00E6BDB5 /* RecapBetCard.swift in Sources */,
 				EC55565D2AD6E5B900E5CA3F /* AuthService.swift in Sources */,
 				D98C4D662AB9D017007A6B4D /* ContentView.swift in Sources */,
+				EC4163512AE126B3001E620D /* DropDownMenuView.swift in Sources */,
 				ECCD6DD92AD7228B00F947C4 /* Singleton.swift in Sources */,
 				D92EC57C2ABADA2800CCD30E /* CoinCounterView.swift in Sources */,
 				EC3737E42AC2F5FB00E6BDB5 /* ChoiceCapsule.swift in Sources */,
diff --git a/Sources/allin/allin/Assets.xcassets/GrayTextColor.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/GrayTextColor.colorset/Contents.json
new file mode 100644
index 0000000..0e54db2
--- /dev/null
+++ b/Sources/allin/allin/Assets.xcassets/GrayTextColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x49",
+          "green" : "0x49",
+          "red" : "0x49"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x49",
+          "green" : "0x49",
+          "red" : "0x49"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sources/allin/allin/Assets.xcassets/chevron_down.imageset/Contents.json b/Sources/allin/allin/Assets.xcassets/chevron_down.imageset/Contents.json
new file mode 100644
index 0000000..2691877
--- /dev/null
+++ b/Sources/allin/allin/Assets.xcassets/chevron_down.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "chevron_down.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sources/allin/allin/Assets.xcassets/chevron_down.imageset/chevron_down.png b/Sources/allin/allin/Assets.xcassets/chevron_down.imageset/chevron_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..86d3dd447812723c0e3b39b8935580a45c8f92e5
GIT binary patch
literal 2229
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
Bgv|f|

literal 0
HcmV?d00001

diff --git a/Sources/allin/allin/Assets.xcassets/chevron_up.imageset/Contents.json b/Sources/allin/allin/Assets.xcassets/chevron_up.imageset/Contents.json
new file mode 100644
index 0000000..17ddf4a
--- /dev/null
+++ b/Sources/allin/allin/Assets.xcassets/chevron_up.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "chevron_up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sources/allin/allin/Assets.xcassets/chevron_up.imageset/chevron_up.png b/Sources/allin/allin/Assets.xcassets/chevron_up.imageset/chevron_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..5920d34f7718f4cb55fff8b10218c0f83e18f52f
GIT binary patch
literal 2147
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
G(*Fxn+G`sC

literal 0
HcmV?d00001

diff --git a/Sources/allin/allin/ContentView.swift b/Sources/allin/allin/ContentView.swift
index f5b2673..30cfc89 100644
--- a/Sources/allin/allin/ContentView.swift
+++ b/Sources/allin/allin/ContentView.swift
@@ -11,7 +11,7 @@ struct ContentView: View {
     
     var body: some View {
         NavigationView {
-            Welcome()
+            Home(page: "CreationBet")
         }
     }
 }
diff --git a/Sources/allin/allin/Ressources/Colors.swift b/Sources/allin/allin/Ressources/Colors.swift
index 11690c9..9befaa0 100644
--- a/Sources/allin/allin/Ressources/Colors.swift
+++ b/Sources/allin/allin/Ressources/Colors.swift
@@ -19,6 +19,7 @@ struct AllinColor {
     static let StartBackground = Color("StartBackground")
     static let blueAccent = Color("BlueAccent")
     static let TopBarColorPink = Color("TopBarColorPink")
+    static let GrayTextColor = Color("GrayTextColor")
     static let VeryLightGray = Color("VeryLightGray")
     static let StartTextColor = Color("StartTextColor")
     static let LightPurple = Color("LightPurple")
diff --git a/Sources/allin/allin/Screens/CreationBetScreen.swift b/Sources/allin/allin/Screens/CreationBetScreen.swift
index b7b85df..ff481d5 100644
--- a/Sources/allin/allin/Screens/CreationBetScreen.swift
+++ b/Sources/allin/allin/Screens/CreationBetScreen.swift
@@ -27,10 +27,10 @@ struct CreationBet: View {
     @State private var values: [String] = []
     
     @State private var selectedOption = 0
-    let options: [(String, String)] = [
-            ("globe", "image1"),
-            ("futbol", "image2"),
-            ("paintbrush", "image3")
+    let options: [(Int, String, String)] = [
+            (0, "globe", "Oui / Non"),
+            (1, "futbol", "Pari sportif"),
+            (2, "paintbrush", "Réponses personnalisées")
         ]
     
     var body: some View {
@@ -55,7 +55,7 @@ struct CreationBet: View {
                                 .padding()
                                 .background(
                                     RoundedRectangle(cornerRadius: 9)
-                                        .fill(Color.white)
+                                        .fill(.white)
                                         .frame(height: 40)
                                 )
                                 .frame(width: 350, height: 40)
@@ -215,91 +215,106 @@ struct CreationBet: View {
                 .tag(0)
                 
                 VStack(alignment: .leading, spacing: 5) {
-                    Picker("Sélectionnez une option", selection: $selectedOption) {
-                        ForEach(0..<options.count, id: \.self) { index in
-                            let (imageName, text) = options[index]
-                            HStack {
-                                Image(imageName)
-                                    .resizable()
-                                    .scaledToFit()
-                                    .frame(width: 30, height: 30)
-                                Text(text)
-
-                            }
-                            .background(Color.white)
-                        }
-                    }
-                    .pickerStyle(MenuPickerStyle())
                     
+                    VStack() {
+                        DropDownMenuView(selectedOption: $selectedOption, options: options)
+                    }
+                    .padding([.bottom], 15)
                     
-                    Text("Les utilisateurs devront répondre au pari avec OUI ou NON.")
-                        .font(.system(size: 13))
-                        .fontWeight(.bold)
-                        .padding(.leading, 35)
-                        .foregroundColor(AllinColor.PurpleLight)
-                    Text("Aucune autre réponse ne sera acceptée.")
-                        .font(.system(size: 13))
-                        .fontWeight(.bold)
-                        .padding(.leading, 35)
-                        .foregroundColor(AllinColor.PurpleLight)
-                    
-                    VStack {
-                        HStack(spacing: 0) {
-                            TextField("", text: $response, prompt: Text("Intitulé de réponse").foregroundColor(AllinColor.PlaceholderLightGrayColor).font(.system(size: 16)).fontWeight(.medium))
-                                .padding()
-                                .background(
-                                    Rectangle()
-                                        .fill(Color.white)
-                                        .cornerRadius(9, corners: [.topLeft, .bottomLeft])
-                                        .frame(height: 38)
-                                )
-                                .frame(width: 250, height: 38)
-                                .foregroundColor(.black)
-                                .onChange(of: response) { newValue in
+                
+                    Group {
+                        switch selectedOption {
+                        case 0:
+                            Text("Les utilisateurs devront répondre au pari avec OUI ou NON.")
+                                .font(.system(size: 13))
+                                .fontWeight(.bold)
+                                .padding(.leading, 40)
+                                .foregroundColor(AllinColor.PurpleLight)
+                            Text("Aucune autre réponse ne sera acceptée.")
+                                .font(.system(size: 13))
+                                .fontWeight(.bold)
+                                .padding(.leading, 40)
+                                .foregroundColor(AllinColor.PurpleLight)
+                        case 2:
+                            Text("Vous allez renseigner les différentes réponses disponibles dans ce pari.")
+                                .font(.system(size: 13))
+                                .fontWeight(.bold)
+                                .padding(.leading, 40)
+                                .foregroundColor(AllinColor.PurpleLight)
+                            Text("Faites attention a etre claire et éviter toutes incertitudes")
+                                .font(.system(size: 13))
+                                .fontWeight(.bold)
+                                .padding(.leading, 40)
+                                .padding(.bottom, 15)
+                                .foregroundColor(AllinColor.PurpleLight)
+                            VStack(spacing: 5) {
+                                HStack(spacing: 0) {
+                                    TextField("", text: $response, prompt: Text("Intitulé de réponse").foregroundColor(AllinColor.PlaceholderLightGrayColor).font(.system(size: 16)).fontWeight(.medium))
+                                        .padding()
+                                        .background(
+                                            Rectangle()
+                                                .fill(Color.white)
+                                                .cornerRadius(9, corners: [.topLeft, .bottomLeft])
+                                                .frame(height: 38)
+                                        )
+                                        .frame(width: 250, height: 38)
+                                        .foregroundColor(.black)
+                                        .onChange(of: response) { newValue in
                                             if newValue.count > 20 {
                                                 response = String(newValue.prefix(20))
                                             }
                                         }
-
-                            
-                            Button(action: {
-                                if !response.isEmpty {
-                                    values.append(response)
-                                    response = ""
-                                }
-                            }) {
-                                Text("Ajouter")
-                                    .foregroundColor(.white)
-                            }
-                            .frame(width: 95, height: 40)
-                            .background(AllinColor.PrimaryTextColor)
-                            .cornerRadius(10, corners: [.bottomRight, .topRight])
-                            .cornerRadius(2, corners: [.bottomLeft, .topLeft])
-                        }
-                        HStack(spacing: 10) {
-                            ForEach(values, id: \.self) { text in
-                                HStack {
-                                    Text(text)
-                                        .foregroundColor(.white)
+                                    
+                                    
                                     Button(action: {
-                                        if let index = values.firstIndex(of: text) {
-                                            values.remove(at: index)
+                                        if !response.isEmpty && values.count < 5 {
+                                            values.append(response)
+                                            response = ""
                                         }
                                     }) {
-                                        Image("cross")
-                                            .resizable()
-                                            .frame(width: 10, height: 10)
+                                        Text("Ajouter")
                                             .foregroundColor(.white)
                                     }
+                                    .frame(width: 95, height: 40)
+                                    .background(AllinColor.PrimaryTextColor)
+                                    .cornerRadius(10, corners: [.bottomRight, .topRight])
+                                    .cornerRadius(2, corners: [.bottomLeft, .topLeft])
+                                }
+                                HStack {
+                                    Spacer()
+                                    Text("encore \(5 - values.count) max.")
+                                        .font(.system(size: 12))
+                                        .fontWeight(.regular)
+                                        .foregroundColor(AllinColor.GrayTextColor)
+                                }
+                                HStack(spacing: 10) {
+                                    ForEach(values, id: \.self) { text in
+                                        HStack {
+                                            Text(text)
+                                                .foregroundColor(.white)
+                                                .lineLimit(1)
+                                            Button(action: {
+                                                if let index = values.firstIndex(of: text) {
+                                                    values.remove(at: index)
+                                                }
+                                            }) {
+                                                Image("cross")
+                                                    .resizable()
+                                                    .frame(width: 10, height: 10)
+                                                    .foregroundColor(.white)
+                                            }
+                                        }
+                                        .padding(5)
+                                        .padding([.leading, .trailing], 8)
+                                        .background(AllinColor.PrimaryTextColor)
+                                        .cornerRadius(16)
+                                    }
                                 }
-                                .padding(5)
-                                .padding([.leading, .trailing], 8)
-                                .background(AllinColor.PrimaryTextColor)
-                                .cornerRadius(16)
                             }
+                        default:
+                            Text("En attente")
                         }
                     }
-                    .padding()
                     Spacer()
                 }
                 .padding([.leading, .trailing, .bottom], 30)
@@ -335,5 +350,4 @@ struct CreationBet: View {
         }
         .edgesIgnoringSafeArea(.bottom).background(AllinColor.backgroundWhite)
     }
-    
 }
diff --git a/Sources/allin/allin/Screens/RegisterScreen.swift b/Sources/allin/allin/Screens/RegisterScreen.swift
index 5628870..af6e149 100644
--- a/Sources/allin/allin/Screens/RegisterScreen.swift
+++ b/Sources/allin/allin/Screens/RegisterScreen.swift
@@ -254,11 +254,7 @@ struct Register: View {
     
     func isValidEmail(email: String) -> Bool
     {
-        if(email.range(of:"^\\w+([-+.']\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", options: .regularExpression) != nil) {
-            return false
-        } else {
-            return true
-        }
+        return email.range(of:"^\\w+([-+.']\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", options: .regularExpression) == nil
     }
     
     func cleanError() {
@@ -266,5 +262,4 @@ struct Register: View {
         errorMail = false
         errorUsername = false
     }
-    
 }
diff --git a/Sources/allin/allin/Views/DropDownMenuView.swift b/Sources/allin/allin/Views/DropDownMenuView.swift
new file mode 100644
index 0000000..b5627ee
--- /dev/null
+++ b/Sources/allin/allin/Views/DropDownMenuView.swift
@@ -0,0 +1,61 @@
+//
+//  DropDownMenuView.swift
+//  AllIn
+//
+//  Created by étudiant on 19/10/2023.
+//
+
+import SwiftUI
+
+struct DropDownMenuView: View {
+    
+    @State var expand = false
+    @Binding var selectedOption: Int
+    var options: [(Int, String, String)]
+    
+    var body: some View {
+        VStack(spacing: 0, content: {
+            Button(action: { self.expand.toggle() }) {
+                HStack{
+                    Image(options[selectedOption].1)
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 15, height: 15)
+                    Text(options[selectedOption].2).fontWeight(.bold).foregroundColor(AllinColor.PrimaryTextColor).font(.system(size: 15))
+                    Spacer()
+                    Image(expand ? "chevron_up" : "chevron_down").resizable().frame(width: 15, height: 10).scaledToFill()
+                }
+                .padding([.leading, .trailing], 15)
+                .frame(height: 43)
+            }
+            if expand {
+                Rectangle()
+                    .frame(height: 1)
+                    .foregroundColor(AllinColor.VeryLightGray)
+                    .padding(.bottom, 18)
+                VStack(spacing: 0) {
+                    ForEach(0..<options.count, id: \.self) { index in
+                        if options[index].0 != selectedOption {
+                            Button(action: {self.selectedOption = options[index].0
+                            self.expand.toggle()}) {
+                                HStack{
+                                    Image(options[index].1)
+                                        .resizable()
+                                        .scaledToFit()
+                                        .frame(width: 15, height: 15)
+                                    Text(options[index].2).fontWeight(.bold).foregroundColor(AllinColor.PrimaryTextColor).font(.system(size: 15))
+                                    Spacer()
+                                }
+                            }
+                            .padding(.bottom, 15)
+                        }
+                    }
+                }
+                .padding([.leading, .trailing], 15)
+            }
+        })
+        .frame(width: 345)
+        .background(.white)
+        .cornerRadius(10)
+    }
+}
diff --git a/Sources/allin/allin/allinApp.swift b/Sources/allin/allin/allinApp.swift
index c09bd14..0b5242b 100644
--- a/Sources/allin/allin/allinApp.swift
+++ b/Sources/allin/allin/allinApp.swift
@@ -9,11 +9,9 @@ import SwiftUI
 
 @main
 struct AllInApp: App {
-    //@StateObject var auth = AuthService()
     var body: some Scene {
         WindowGroup {
             ContentView()
-               // .environmentObject(auth)
         }
     }
 }