Merge pull request 'ParametersMenuView' (#14) from ParametersMenuView into dev

Reviewed-on: #14

ArkitDoushiQi/ArkitDoushiQi/Views/DoushiQiPicker.swift

@@ -35,7 +35,7 @@ struct DoushiQiPicker<EnumType: RawRepresentable & Identifiable & Hashable>: Vie
                     Text(title)
                         .foregroundColor(.black)
                         .padding()
-                    Spacer() // .frame(width : (20 - CGFloat(title.count)))
+                    Spacer()
                     Text(selectedOption.rawValue.description)
                         .foregroundColor(.black)
                         .padding()

ArkitDoushiQi/ArkitDoushiQi/Views/MainMenu.swift

@@ -8,37 +8,42 @@
 import SwiftUI
 
 struct MainMenu: View {
+    let playButtonText : String
+    let registeredGamesButtonText : String
+    let ParametersButtontText : String
     @State private var action: Int? = 0
     @AppStorage("isDarkMode") private var isDarkMode = false
     var body: some View {
-        VStack {
+        ZStack {
             NavigationView {
-                VStack(alignment: .trailing) {
+                    VStack {
-                    HStack(alignment: .top) {
+                        Spacer()
-                        Text("DouShiQi").frame(maxHeight: .infinity)
+                        HStack() {
+                            Text("DouShiQi")
                                 .bold()
-                            .font(.title)
+                                .font(.title).padding()
-                    }.frame(maxWidth: .infinity,maxHeight: .infinity)
+                        }
-                    Spacer().frame(maxWidth: .infinity,maxHeight: .infinity)
                         Spacer().frame(height: 40)
-                    MainMenuButton(title: "jouer")
+                        VStack(alignment: .leading) {
+                            MainMenuButton(title: playButtonText)
                             { Text("jeu page") }
-                    MainMenuButton(title: "parties enregistrées")
+                            Spacer().frame(height: 30)
+                            MainMenuButton(title: registeredGamesButtonText)
                             { Text("parties enregistrées page") }
-                    MainMenuButton(title: "paramètres")
+                            Spacer().frame(height: 30)
+                            MainMenuButton(title: ParametersButtontText)
                             { ParametersMenuView() }
+                        }
                         Spacer()
                     }
-                .fixedSize(horizontal: false, vertical: true)
                     .padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32))
-                .frame(maxWidth: .infinity,maxHeight: .infinity)
+                }
-            }.frame(maxWidth: .infinity,maxHeight: .infinity)
+            }
-        }.frame(maxWidth: .infinity,maxHeight: .infinity)
     }
 }
 
 struct MainMenu_Previews: PreviewProvider {
     static var previews: some View {
-        MainMenu()
+        MainMenu(playButtonText: "Jouer", registeredGamesButtonText: "Parties enregistrées",ParametersButtontText: "Paramètres")
     }
 }

ArkitDoushiQi/ArkitDoushiQi/Views/MainMenuButton.swift

@@ -17,19 +17,19 @@ struct MainMenuButton<Content : View>: View {
         }
     
     var body: some View {
-        NavigationLink(title){
+        NavigationLink {
             // ici mettre la vue sur les parties enregistrées à la place du texte n'hésite pas à tester sur la preview la navigation ça marche, faire pareil pour les autres
             content
-        }
+        } label: {
+          Text(title)
                 .frame(maxWidth: .infinity)
                 .padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32))
-            .buttonStyle(.bordered)
                 .controlSize(.large)
                 .foregroundColor(.white)
-            .background(.black)
+        }
         .buttonBorderShape(.roundedRectangle)
-            .clipShape(Capsule())
+        .buttonStyle(.borderedProminent)
-        Spacer().frame(height: 50)
+        .tint(.black)
     }
 }