From faa958111d64d4d48f0452df180e6fba060cfc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoan=20BRUGI=C3=88RE?= Date: Tue, 23 May 2023 15:24:12 +0200 Subject: [PATCH] Menu de navigation unique --- Sources/Ohara/App.xaml.cs | 6 +- Sources/Ohara/AppShell.xaml | 38 ++++- Sources/Ohara/MainPage.xaml | 85 +++------- Sources/Ohara/MainPage.xaml.cs | 72 +------- Sources/Ohara/PageBateau.xaml | 133 ++++++--------- Sources/Ohara/PageBateau.xaml.cs | 68 +------- Sources/Ohara/PageBestiaire.xaml | 102 +++++------ Sources/Ohara/PageBestiaire.xaml.cs | 65 +------ Sources/Ohara/PageCarte.xaml | 35 +--- Sources/Ohara/PageCarte.xaml.cs | 58 +------ Sources/Ohara/PageEquipage.xaml | 105 +++++------- Sources/Ohara/PageEquipage.xaml.cs | 68 +------- Sources/Ohara/PageFDD.xaml | 147 +++++++--------- Sources/Ohara/PageFDD.xaml.cs | 61 +------ Sources/Ohara/PageFavoris.xaml | 122 ++++++------- Sources/Ohara/PageFavoris.xaml.cs | 65 +------ Sources/Ohara/PageIle.xaml | 132 ++++++--------- Sources/Ohara/PageIle.xaml.cs | 65 +------ Sources/Ohara/PageInfoBateau.xaml | 156 +++++++---------- Sources/Ohara/PageInfoBateau.xaml.cs | 44 +---- Sources/Ohara/PageInfoBestiaire.xaml | 116 +++++-------- Sources/Ohara/PageInfoBestiaire.xaml.cs | 43 ----- Sources/Ohara/PageInfoEquipage.xaml | 146 +++++++--------- Sources/Ohara/PageInfoEquipage.xaml.cs | 42 ----- Sources/Ohara/PageInfoFdd.xaml | 182 +++++++++----------- Sources/Ohara/PageInfoFdd.xaml.cs | 44 ----- Sources/Ohara/PageInfoIle.xaml | 145 +++++++--------- Sources/Ohara/PageInfoIle.xaml.cs | 44 ----- Sources/Ohara/PageInfoPersonnage.xaml | 188 +++++++++------------ Sources/Ohara/PageInfoPersonnage.xaml.cs | 42 ----- Sources/Ohara/PagePersonnage.xaml | 42 +---- Sources/Ohara/PagePersonnage.xaml.cs | 68 +------- Sources/Ohara/Resources/Styles/Styles.xaml | 2 + 33 files changed, 756 insertions(+), 1975 deletions(-) diff --git a/Sources/Ohara/App.xaml.cs b/Sources/Ohara/App.xaml.cs index a751b57..22d1d53 100644 --- a/Sources/Ohara/App.xaml.cs +++ b/Sources/Ohara/App.xaml.cs @@ -1,10 +1,12 @@ -using Plugin.Maui.Audio; +using Model; +using Plugin.Maui.Audio; namespace Ohara; public partial class App : Application { - public App() + public Manager manager { get; set; } = new Manager(); + public App() { InitializeComponent(); diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml index 66dd193..04d8f36 100644 --- a/Sources/Ohara/AppShell.xaml +++ b/Sources/Ohara/AppShell.xaml @@ -4,17 +4,39 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:Ohara" - Shell.FlyoutBehavior="Disabled" - Shell.NavBarIsVisible="False"> + Shell.FlyoutBehavior="Locked" + Shell.NavBarIsVisible="False" + Shell.Background="#72a3b3" + > - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml index 04d3b4f..a21a3e5 100644 --- a/Sources/Ohara/MainPage.xaml +++ b/Sources/Ohara/MainPage.xaml @@ -4,69 +4,24 @@ x:Class="Ohara.MainPage" BackgroundColor="#e2edf1"> - - - - - - - - - - - - - - - - - - - - -