From 85bcc051c170ad1ff9bbf3f8c2a2ebec24f35ea0 Mon Sep 17 00:00:00 2001 From: "johan.lachenal" Date: Wed, 22 May 2024 16:22:44 +0200 Subject: [PATCH 1/3] Update(ParametersMenuView): correct the width of the button so it catches the action when you click on the border of it --- .../Preview Content/MainMenu.swift | 11 ++++++---- .../Preview Content/MainMenuButton.swift | 20 +++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift index e365fd8..ba94bb4 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift @@ -8,6 +8,9 @@ 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 { @@ -21,11 +24,11 @@ struct MainMenu: View { }.frame(maxWidth: .infinity,maxHeight: .infinity) Spacer().frame(maxWidth: .infinity,maxHeight: .infinity) Spacer().frame(height: 40) - MainMenuButton(title: "jouer") + MainMenuButton(title: playButtonText) { Text("jeu page") } - MainMenuButton(title: "parties enregistrées") + MainMenuButton(title: registeredGamesButtonText) { Text("parties enregistrées page") } - MainMenuButton(title: "paramètres") + MainMenuButton(title: ParametersButtontText) { ParametersMenuView() } Spacer() } @@ -39,6 +42,6 @@ struct MainMenu: View { struct MainMenu_Previews: PreviewProvider { static var previews: some View { - MainMenu() + MainMenu(playButtonText: "Jouer", registeredGamesButtonText: "Parties enregistrées",ParametersButtontText: "Paramètres") } } diff --git a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenuButton.swift b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenuButton.swift index 2e831ff..1197f52 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenuButton.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenuButton.swift @@ -17,19 +17,19 @@ struct MainMenuButton: 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)) + .controlSize(.large) + .foregroundColor(.white) } - .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()) - Spacer().frame(height: 50) + .buttonBorderShape(.roundedRectangle) + .buttonStyle(.borderedProminent) + .tint(.black) } } -- 2.36.3 From 5cc827ebbbcf7e9e1321d228fc34885b51918d01 Mon Sep 17 00:00:00 2001 From: "johan.lachenal" Date: Wed, 22 May 2024 17:14:36 +0200 Subject: [PATCH 2/3] Update(MainMenu) --- .../Preview Content/MainMenu.swift | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift index ba94bb4..b8f87f5 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift @@ -14,29 +14,34 @@ struct MainMenu: View { @State private var action: Int? = 0 @AppStorage("isDarkMode") private var isDarkMode = false var body: some View { - VStack { + ZStack { NavigationView { - VStack(alignment: .trailing) { - HStack(alignment: .top) { - Text("DouShiQi").frame(maxHeight: .infinity) - .bold() - .font(.title) - }.frame(maxWidth: .infinity,maxHeight: .infinity) - Spacer().frame(maxWidth: .infinity,maxHeight: .infinity) - Spacer().frame(height: 40) - MainMenuButton(title: playButtonText) - { Text("jeu page") } - MainMenuButton(title: registeredGamesButtonText) - { Text("parties enregistrées page") } - 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) + VStack { + Spacer() + HStack() { + Text("DouShiQi") + .bold() + .font(.title).padding() + } + //.frame(maxWidth: .infinity,maxHeight: .infinity) + Spacer().frame(height: 40) + VStack(alignment: .leading) { + MainMenuButton(title: playButtonText) + { Text("jeu page") } + Spacer().frame(height: 30) + MainMenuButton(title: registeredGamesButtonText) + { Text("parties enregistrées page") } + Spacer().frame(height: 30) + MainMenuButton(title: ParametersButtontText) + { ParametersMenuView() } + } + Spacer() + } + .padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32)) + // .frame(maxWidth: .infinity,maxHeight: .infinity) + // Spacer() + }//.frame(maxWidth: .infinity,maxHeight: .infinity) + } } } -- 2.36.3 From c114ef21bf89410aa26c2a4a21ab1b408002345c Mon Sep 17 00:00:00 2001 From: "johan.lachenal" Date: Wed, 22 May 2024 17:20:34 +0200 Subject: [PATCH 3/3] add --- .../ArkitDoushiQi/Preview Content/DoushiQiPicker.swift | 2 +- ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/DoushiQiPicker.swift b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/DoushiQiPicker.swift index e3312f8..67699af 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/DoushiQiPicker.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/DoushiQiPicker.swift @@ -35,7 +35,7 @@ struct DoushiQiPicker: Vie Text(title) .foregroundColor(.black) .padding() - Spacer() // .frame(width : (20 - CGFloat(title.count))) + Spacer() Text(selectedOption.rawValue.description) .foregroundColor(.black) .padding() diff --git a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift index b8f87f5..54d060e 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Preview Content/MainMenu.swift @@ -23,7 +23,6 @@ struct MainMenu: View { .bold() .font(.title).padding() } - //.frame(maxWidth: .infinity,maxHeight: .infinity) Spacer().frame(height: 40) VStack(alignment: .leading) { MainMenuButton(title: playButtonText) @@ -38,9 +37,7 @@ struct MainMenu: View { Spacer() } .padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32)) - // .frame(maxWidth: .infinity,maxHeight: .infinity) - // Spacer() - }//.frame(maxWidth: .infinity,maxHeight: .infinity) + } } } } -- 2.36.3